From 9d1915af786379446ac7465215b6f3679f270e19 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sat, 30 Mar 2019 18:50:32 +0100
Subject: map scroll

---
 site/assets/css/applets.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'site')

diff --git a/site/assets/css/applets.css b/site/assets/css/applets.css
index e5c427b2..10c0e786 100644
--- a/site/assets/css/applets.css
+++ b/site/assets/css/applets.css
@@ -168,6 +168,10 @@
 .desktop .map_cover:hover {
   opacity: 1;
 }
+.leaflet-popup-content-wrapper {
+  max-height: 230px;
+  overflow-y: auto;
+}
 .leaflet-popup-content a {
   color: #0078A8;
   border-bottom: 1px solid rgba(0, 128, 160, 0.4);
-- 
cgit v1.2.3-70-g09d2


From 45bf844c0891098232b2a7ff5458cd2de32acbdf Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Sun, 31 Mar 2019 15:58:20 +0200
Subject: update about

---
 site/content/pages/about/credits.md | 48 -----------------------------
 site/content/pages/about/faq.md     | 28 +++++++++++++++++
 site/content/pages/about/index.md   | 60 +++++++++++++++++++++++--------------
 3 files changed, 65 insertions(+), 71 deletions(-)
 delete mode 100644 site/content/pages/about/credits.md
 create mode 100644 site/content/pages/about/faq.md

(limited to 'site')

diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md
deleted file mode 100644
index bc2283fd..00000000
--- a/site/content/pages/about/credits.md
+++ /dev/null
@@ -1,48 +0,0 @@
-------------
-
-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/faq.md b/site/content/pages/about/faq.md
new file mode 100644
index 00000000..cec53813
--- /dev/null
+++ b/site/content/pages/about/faq.md
@@ -0,0 +1,28 @@
+------------
+
+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
+ 
+------------
+ 
+# FAQs
+
+<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>
+
+
+[ page under development ]
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index 4fec0777..c2d67f16 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -16,41 +16,55 @@ authors: Adam Harvey
 <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/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>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
-(PAGE UNDER DEVELOPMENT)
+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><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>
-
-Collectively, facial recognition datasets are now gathered "in the wild".
-
-<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>
-
-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).
+The MegaPixels site is made possible with support from <a href="http://mozilla.org">Mozilla</a>
 
 <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>
+        <h3>Adam Harvey</h4>
+        <p>is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for counter-surveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups) and is a currently researcher in residence at Karlsruhe HfG.</p>
+        <p><a href="https://ahprojects.com">ahprojects.com</a></p>
         </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>is an American technologist and artist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision and data analysis software for human rights groups. Jules also builds experimental software for artists and musicians.
         </p>
+        <p><a href="https://asdf.us/">asdf.us</a></p>
     </div>
 </div>
+
+MegaPixels.cc is an independent research project about publicly available face recognition datasets. This website is based, in part, on earlier installations and research project about facial recognition datasets in 2016-2018, in particular the MegaFace dataset. Since then it has evolved into a large-scale survey and analysis of publicly available face and person analysis dataset usage, geographies, and ethics.
+
+An academic report and presentation on the findings is forthcoming. This site is published to make the research more accessible to a wider audience and to include visualizations and interactive features not possible in PDF publications. Continued research on MegaPixles is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG.
+
+When possible, and once thoroughly verified, data generated for MegaPixels will be made available for download on [github.com/adamhrv/megapixels](https://github.com/adamhrv/megapixels)
+
+#### Team
+
+- Adam Harvey: Concept, research, design, computer vision
+- Jules LaPlace: Information and systems architecture, data retrieval, web applications
+
+#### Contributing Researchers
+
+- Berit Gilma: Dataset statistics and discovery
+- Beth (aka Ms. Celeb): Dataset usage verification and research
+- Mathana Stender: Commercial usage verification and research on LFW
+
+#### Code and Libraries
+
+- [Semantic Scholar](https://semanticscholar.org) for citation aggregation
+- Leaflet.js for maps
+- C3.js for charts
+- D3.js and ThreeJS for 3D visualizations
+- PDFMiner.Six and Pandas for research paper data analysis
+
+Please direct questions, comments, or feedback to [mastodon.social/@adamhrv](https://mastodon.social/@adamhrv)
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 84508d90fd53c938de4839d72b02f42d271cb489 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Sun, 31 Mar 2019 16:01:13 +0200
Subject: css for about page

---
 site/assets/css/css.css       | 131 +++++++++++++++++++++++++-----------------
 site/assets/css/tabulator.css |  17 ++++--
 2 files changed, 88 insertions(+), 60 deletions(-)

(limited to 'site')

diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 47fc0652..0244b86b 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -464,10 +464,10 @@ section.fullwidth .image {
   text-align: center;
 }
 .image .caption.intro-caption{
-  text-align: left;
+  text-align: center;
 }
 .caption {
-  text-align: left;
+  text-align: center;
   font-size: 10pt;
   color: #999;
   max-width: 960px;
@@ -484,50 +484,6 @@ section.fullwidth .image {
 }
 
 
-/* about page */
-
-
-.flex-container {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-  
-  display: -webkit-box;
-  display: -moz-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  
-  -webkit-flex-flow: row wrap;
-  justify-content: space-around;
-}
-
-.team-photos-container{
-  margin-top:40px;
-}
-.team-member {
-  height: auto;
-  margin-top: 10px;
-  color: white;
-  width: 400px;
-  font-weight: bold;
-  flex-grow: 1;
-  margin:0 40px 0 0;
-  padding:20px;
-  border-radius:6px;
-  background: #202020;
-}
-.team-member&:last-child{
-  margin:0 0 0 40px;
-}
-.team-member p{
-  font-size:14px;
-}
-.team-member img{
-  margin:0;
-  display: block;
-}
-
 
 .sideimage {
   margin: 0px 0 40px 0;
@@ -771,7 +727,7 @@ section.intro_section {
   background-size: cover;
   background-position: center left;
   padding: 50px 0;
-  /*min-height: 40vh;*/
+  min-height: 40vh;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -829,7 +785,7 @@ page-specific formatting
     position: relative;
     width: 100%;
     height: 50px;
-    margin-top:100px;
+    margin-top:50px;
 }
 
 .hr-wave-line1 {
@@ -848,34 +804,54 @@ page-specific formatting
 
 /* map */
 
-.map-legend-item{
+ul.map-legend{
   display: inline-block;
+  margin:0;
+}
+ul.map-legend li{
   margin-right: 10px;
   padding-top:4px;
+  display: inline-block;
 }
-.map-legend-item:before {
+ul.map-legend li:before {
   content: '';
   display: inline-block;
   width: 10px;
   height: 10px;
-  /*margin-bottom: 2px;*/
   margin-right: 6px;
 }
-.map-legend-item.edu:before {
+ul.map-legend li.edu:before {
   background-color: #f2f293;
 }
-.map-legend-item.com:before {
+ul.map-legend li.com:before {
   background-color: #3264f6;
 }
-.map-legend-item.gov:before {
+ul.map-legend li.gov:before {
   background-color: #f30000;
 }
+ul.map-legend li.source:before {
+  content: none;
+  display: inline-block;
+  width: 0px;
+  margin-right: 10px;
+}
 
 /* about */
 
 .content-about {
   color: #fff;
 }
+.content-about p {
+  font-size:16px;
+}
+.content-about ul{
+ font-size:14px;
+ font-weight: 300; 
+}
+.content-about section > p:first-of-type{
+  font-size:23px;
+  line-height:39px;
+}
 .content-about .about-menu ul li {
   display: inline-block;
   font-size: 14px;
@@ -894,6 +870,53 @@ page-specific formatting
   border-bottom: 1px solid #ddd;
   color: #ddd;
 }
+/* about page */
+
+
+.flex-container {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+  
+  display: -webkit-box;
+  display: -moz-box;
+  display: -ms-flexbox;
+  display: -webkit-flex;
+  display: flex;
+  
+  -webkit-flex-flow: row wrap;
+  justify-content: space-around;
+}
+
+.content-about .team-photos-container{
+  margin:40px 0;
+}
+.content-about .team-member {
+  height: auto;
+  margin-top: 10px;
+  color: white;
+  width: 400px;
+  font-weight: bold;
+  flex-grow: 1;
+  margin:0 40px 0 0;
+  padding:20px;
+  border-radius:6px;
+  background: #202020;
+}
+.content-about .team-member&:last-child{
+  margin:0 0 0 40px;
+}
+.content-about .team-member p{
+  font-size:14px;
+}
+.content-about .team-member img{
+  margin:0;
+  display: block;
+}
+.content-about .team-member h3{
+  font-size:18px;
+}
+
 
 
 /* footnotes */
diff --git a/site/assets/css/tabulator.css b/site/assets/css/tabulator.css
index 41c7ffa4..d26b5cfc 100755
--- a/site/assets/css/tabulator.css
+++ b/site/assets/css/tabulator.css
@@ -1,7 +1,7 @@
 /* Tabulator v4.1.3 (c) Oliver Folkerd */
 .tabulator {
   position: relative;
-  font-size: 14px;
+  font-size: 13px;
   text-align: left;
   overflow: hidden;
   -ms-transform: translatez(0);
@@ -23,7 +23,7 @@
   position: relative;
   box-sizing: border-box;
   width: 100%;
-  border-bottom: 1px solid #999;
+  border-bottom: 1px solid #333;
   color: #ddd;
   white-space: nowrap;
   overflow: hidden;
@@ -41,6 +41,7 @@
   text-align: left;
   vertical-align: bottom;
   overflow: hidden;
+  padding: 5px 0;
 }
 
 .tabulator .tabulator-header .tabulator-col.tabulator-moving {
@@ -63,6 +64,9 @@
   overflow: hidden;
   text-overflow: ellipsis;
   vertical-align: bottom;
+  /* AH */
+  font-weight: 500;
+  font-size:14px;
 }
 
 .tabulator .tabulator-header .tabulator-col .tabulator-col-content .tabulator-col-title .tabulator-title-editor {
@@ -76,13 +80,13 @@
 .tabulator .tabulator-header .tabulator-col .tabulator-col-content .tabulator-arrow {
   display: inline-block;
   position: absolute;
-  top: 9px;
+  top: 11px;
   right: 8px;
   width: 0;
   height: 0;
   border-left: 6px solid transparent;
   border-right: 6px solid transparent;
-  border-bottom: 6px solid #bbb;
+  border-bottom: 6px solid #666;
 }
 
 .tabulator .tabulator-header .tabulator-col.tabulator-col-group .tabulator-col-group-cols {
@@ -129,6 +133,7 @@
 
 .tabulator .tabulator-header .tabulator-col.tabulator-sortable .tabulator-col-title {
   padding-right: 25px;
+  padding-left: 6px;
 }
 
 .tabulator .tabulator-header .tabulator-col.tabulator-sortable:hover {
@@ -137,7 +142,7 @@
 
 .tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="none"] .tabulator-col-content .tabulator-arrow {
   border-top: none;
-  border-bottom: 6px solid #bbb;
+  border-bottom: 6px solid #666;
 }
 
 .tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="asc"] .tabulator-col-content .tabulator-arrow {
@@ -723,7 +728,7 @@
   max-height: 200px;
   background: #fff;
   border: 1px solid #333;
-  font-size: 14px;
+  font-size: 13px;
   overflow-y: auto;
   -webkit-overflow-scrolling: touch;
   z-index: 10000;
-- 
cgit v1.2.3-70-g09d2


From 804b2e58f81000f883f75d79a66676ce545fbdc8 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 31 Mar 2019 16:02:40 +0200
Subject: rebuild

---
 site/public/about/faq/index.html                   | 60 ++++++++++++++++++++++
 site/public/about/index.html                       | 52 ++++++++++++-------
 .../datasets/50_people_one_question/index.html     | 14 ++---
 site/public/datasets/brainwash/index.html          | 16 +++---
 site/public/datasets/celeba/index.html             | 14 ++---
 site/public/datasets/cofw/index.html               | 16 +++---
 site/public/datasets/duke_mtmc/index.html          | 18 ++++---
 site/public/datasets/hrt_transgender/index.html    | 16 +++---
 site/public/datasets/lfw/index.html                | 16 +++---
 site/public/datasets/market_1501/index.html        | 14 ++---
 site/public/datasets/pipa/index.html               | 14 ++---
 site/public/datasets/uccs/index.html               | 18 ++++---
 site/public/datasets/viper/index.html              | 16 +++---
 13 files changed, 199 insertions(+), 85 deletions(-)
 create mode 100644 site/public/about/faq/index.html

(limited to 'site')

diff --git a/site/public/about/faq/index.html b/site/public/about/faq/index.html
new file mode 100644
index 00000000..738759ab
--- /dev/null
+++ b/site/public/about/faq/index.html
@@ -0,0 +1,60 @@
+<!doctype html>
+<html>
+<head>
+  <title>MegaPixels</title>
+  <meta charset="utf-8" />
+  <meta name="author" content="Adam Harvey" />
+  <meta name="description" content="MegaPixels Press and News" />
+  <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="/about/">About</a>
+    </div>
+  </header>
+  <div class="content content-about">
+    
+  <section><h1>FAQs</h1>
+<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><p>[ page under development ]</p>
+</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 3c270ee1..5b98ab34 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -30,34 +30,50 @@
 <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/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>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
-</section><p>(PAGE UNDER DEVELOPMENT)</p>
-<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><p>Collectively, facial recognition datasets are now gathered "in the wild".</p>
-<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><p>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.</p>
-<p>The MegaPixels website is produced in partnership with <a href="https://mozilla.org">Mozilla</a>.</p>
+</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>
 <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>
+       <h3>Adam Harvey</h4>
+       <p>is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for counter-surveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups) and is a currently researcher in residence at Karlsruhe HfG.</p>
+       <p><a href="https://ahprojects.com">ahprojects.com</a></p>
        </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>is an American technologist and artist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision and data analysis software for human rights groups. Jules also builds experimental software for artists and musicians.
        </p>
+       <p><a href="https://asdf.us/">asdf.us</a></p>
    </div>
-</div></section>
+</div><p>MegaPixels.cc is an independent research project about publicly available face recognition datasets. This website is based, in part, on earlier installations and research project about facial recognition datasets in 2016-2018, in particular the MegaFace dataset. Since then it has evolved into a large-scale survey and analysis of publicly available face and person analysis dataset usage, geographies, and ethics.</p>
+<p>An academic report and presentation on the findings is forthcoming. This site is published to make the research more accessible to a wider audience and to include visualizations and interactive features not possible in PDF publications. Continued research on MegaPixles is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG.</p>
+<p>When possible, and once thoroughly verified, data generated for MegaPixels will be made available for download on <a href="https://github.com/adamhrv/megapixels">github.com/adamhrv/megapixels</a></p>
+<h4>Team</h4>
+<ul>
+<li>Adam Harvey: Concept, research, design, computer vision</li>
+<li>Jules LaPlace: Information and systems architecture, data retrieval, web applications</li>
+</ul>
+<h4>Contributing Researchers</h4>
+<ul>
+<li>Berit Gilma: Dataset statistics and discovery</li>
+<li>Beth (aka Ms. Celeb): Dataset usage verification and research</li>
+<li>Mathana Stender: Commercial usage verification and research on LFW</li>
+</ul>
+<h4>Code and Libraries</h4>
+<ul>
+<li><a href="https://semanticscholar.org">Semantic Scholar</a> for citation aggregation</li>
+<li>Leaflet.js for maps</li>
+<li>C3.js for charts</li>
+<li>D3.js and ThreeJS for 3D visualizations</li>
+<li>PDFMiner.Six and Pandas for research paper data analysis</li>
+</ul>
+<p>Please direct questions, comments, or feedback to <a href="https://mastodon.social/@adamhrv">mastodon.social/@adamhrv</a></p>
+</section>
 
   </div>
   <footer>
diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index bded7fbd..9ed6d11e 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -56,15 +56,17 @@
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of 50 People One Question Dataset.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] 50 People One Question Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section>
 
@@ -83,7 +85,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index 41484257..fb08c168 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -43,6 +43,8 @@
  </section>
 
 <section class="applet_container">
+<!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
+</div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
 </section><section>
   <p>
@@ -78,15 +80,17 @@
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of Brainwash Dataset.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] Brainwash Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section><p>Add more analysis here</p>
 </section><section>
@@ -106,7 +110,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index 09347f10..a0f0c683 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -56,15 +56,17 @@
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of CelebA Dataset.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] CelebA Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section>
 
@@ -83,7 +85,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index eac1f7a6..640eab52 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -66,15 +66,17 @@ To increase the number of training images, and since  COFW has the exact same la
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of COFW Dataset.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] COFW Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section>
 
@@ -93,7 +95,7 @@ To increase the number of training images, and since  COFW has the exact same la
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
@@ -108,6 +110,8 @@ To increase the number of training images, and since  COFW has the exact same la
  </section>
 
 <section class="applet_container">
+<!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
+</div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
 </section><section><p>TODO</p>
 <h2>- replace graphic</h2>
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index 299331d7..160888e2 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -54,15 +54,17 @@
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of Duke MTMC Dataset.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] Duke MTMC Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section>
   <h3>Who used Duke MTMC Dataset?</h3>
@@ -75,6 +77,8 @@
  </section>
 
 <section class="applet_container">
+<!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
+</div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
 </section><section>
   <p>
@@ -102,12 +106,14 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h2>Research Notes</h2>
 <ul>
+<li>"We make available a new data set that has more than 2 million frames and more than 2,700 identities. It consists of 8×85 minutes of 1080p video recorded at 60 frames per second from 8 static cameras deployed on the Duke University campus during periods between lectures, when pedestrian traffic is heavy." - 27a2fad58dd8727e280f97036e0d2bc55ef5424c</li>
+<li>"This work was supported in part by the EPSRC Programme Grant (FACER2VM) EP/N007743/1, EPSRC/dstl/MURI project EP/R018456/1, the National Natural Science Foundation of China (61373055, 61672265, 61602390, 61532009, 61571313), Chinese Ministry of Education (Z2015101), Science and Technology Department of Sichuan Province (2017RZ0009 and 2017FZ0029), Education Department of Sichuan Province (15ZB0130), the Open Research Fund from Province Key Laboratory of Xihua University (szjj2015-056) and the NVIDIA GPU Grant Program." - ec9c20ed6cce15e9b63ac96bb5a6d55e69661e0b</li>
 <li>"DukeMTMC aims to accelerate advances in multi-target multi-camera tracking. It provides a tracking system that works within and across cameras, a new large scale HD video data set recorded by 8 synchronized cameras with more than 7,000 single camera trajectories and over 2,000 unique identities, and a new performance evaluation method that measures how often a system is correct about who is where"</li>
 <li><p>DukeMTMC is a new, manually annotated, calibrated, multi-camera data set recorded outdoors on the Duke University campus with 8 synchronized cameras. It consists of:</p>
 <p>8 static cameras x 85 minutes of 1080p 60 fps video
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index e38e134b..8b870128 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -39,6 +39,8 @@
  </section>
 
 <section class="applet_container">
+<!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
+</div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
 </section><section>
   <p>
@@ -74,15 +76,17 @@
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of HRT Transgender.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] HRT Transgender ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section>
 
@@ -101,7 +105,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index b4923877..dd94c8c5 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -69,15 +69,17 @@
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of LFW.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] LFW ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section>
   <h3>Who used LFW?</h3>
@@ -90,6 +92,8 @@
  </section>
 
 <section class="applet_container">
+<!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
+</div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
 </section><section>
   <p>
@@ -117,7 +121,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index a80c23fa..b3170925 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -54,15 +54,17 @@
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of Market 1501.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] Market 1501 ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section>
 
@@ -81,7 +83,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index 62754070..43b08f17 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -54,15 +54,17 @@
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of PIPA Dataset.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] PIPA Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section>
 
@@ -81,7 +83,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index 08000c6e..5cea1c6b 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -54,15 +54,17 @@
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of UCCS.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] UCCS ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section>
   <h3>Who used UCCS?</h3>
@@ -75,6 +77,8 @@
  </section>
 
 <section class="applet_container">
+<!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
+</div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
 </section><section>
   <p>
@@ -102,11 +106,11 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
-</section><section><h3>Research Notes</h3>
+</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/uccs_bboxes_grayscale.jpg' alt='Bounding box visualization'><div class='caption'>Bounding box visualization</div></div></section><section><h3>Research Notes</h3>
 <p>The original Sapkota and Boult dataset, from which UCCS is derived, received funding from<sup class="footnote-ref" id="fnref-funding_sb"><a href="#fn-funding_sb">1</a></sup>:</p>
 <ul>
 <li>ONR (Office of Naval Research) MURI (The Department of Defense Multidisciplinary University Research Initiative) grant N00014-08-1-0638</li>
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index 5acd0845..f30caeab 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -42,6 +42,8 @@
  </section>
 
 <section class="applet_container">
+<!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
+</div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
 </section><section>
   <p>
@@ -77,15 +79,17 @@
 </section>
 
 <div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and has been manually verified to show usage of VIPeR.
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
 </div>
 
 <section>
 	<p class='subp'>
-		Standardized paragraph of text about the map. 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.
+		[section under development] VIPeR ... Standardized paragraph of text about the map. 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.
 	</p>
 </section><section>
 
@@ -104,7 +108,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add button/link to download CSV
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
-- 
cgit v1.2.3-70-g09d2


From 6366b90b7e124a0059e2ebebe0f813b2e35e2f66 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 31 Mar 2019 16:54:38 +0200
Subject: columns

---
 megapixels/app/site/parser.py     | 22 ++++++++++++++++++++++
 site/assets/css/css.css           | 26 ++++++++++++++++++++------
 site/content/pages/about/index.md | 16 ++++++++++++----
 site/public/about/index.html      | 16 ++++++++--------
 4 files changed, 62 insertions(+), 18 deletions(-)

(limited to 'site')

diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py
index 00470e4b..06c45f41 100644
--- a/megapixels/app/site/parser.py
+++ b/megapixels/app/site/parser.py
@@ -27,6 +27,7 @@ def parse_markdown(metadata, sections, s3_path, skip_h1=False):
   current_group = []
   footnotes = []
   in_stats = False
+  in_columns = False
   in_footnotes = False
   ignoring = False
 
@@ -50,6 +51,7 @@ def parse_markdown(metadata, sections, s3_path, skip_h1=False):
       footnotes.append(section)
     elif ignoring:
       continue
+
     elif '### statistics' in section.lower() or '### sidebar' in section.lower():
       if len(current_group):
         groups.append(format_section(current_group, s3_path))
@@ -64,6 +66,26 @@ def parse_markdown(metadata, sections, s3_path, skip_h1=False):
       if 'end sidebar' not in section.lower():
         current_group.append(section)
       in_stats = False
+
+    elif '=== columns' in section.lower():
+      if len(current_group):
+        groups.append(format_section(current_group, s3_path))
+      current_group = []
+      in_columns = True
+      column_partz = section.split(' ')
+      if len(column_partz) == 3:
+        column_count = column_partz[2]
+      else:
+        column_count = "N"
+      groups.append("<section><div class='columns columns-{}'>".format(column_count))
+    elif in_columns is True and '===' in section:
+      groups.append(format_section(current_group, s3_path, type='column', tag='div'))
+      current_group = []
+      if 'end columns' in section:
+        groups.append("</div></section>")
+        in_columns = False
+        current_group = []
+
     elif section.strip().startswith('{% include'):
       groups.append(format_section(current_group, s3_path))
       current_group = []
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 0244b86b..b9e99efe 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -842,21 +842,20 @@ ul.map-legend li.source:before {
   color: #fff;
 }
 .content-about p {
-  font-size:16px;
+  font-size: 16px;
 }
 .content-about ul{
- font-size:14px;
+ font-size: 14px;
  font-weight: 300; 
 }
-.content-about section > p:first-of-type{
-  font-size:23px;
-  line-height:39px;
+.content-about section:first-of-type > p:first-of-type {
+  font-size: 23px;
+  line-height: 39px;
 }
 .content-about .about-menu ul li {
   display: inline-block;
   font-size: 14px;
   font-weight: 400;
-  margin-right: 8px;
   text-transform: uppercase;
   margin-right: 15px;
   font-family: 'Roboto';
@@ -870,6 +869,21 @@ ul.map-legend li.source:before {
   border-bottom: 1px solid #ddd;
   color: #ddd;
 }
+
+/* columns */
+
+.columns {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+}
+.columns-3 .column {
+  width: 33%;
+  padding-right: 20px;
+  font-family: Roboto, sans-serif;
+  font-weight: 400;
+}
+
 /* about page */
 
 
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index c2d67f16..5fc147c9 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -29,7 +29,7 @@ The MegaPixels site is made possible with support from <a href="http://mozilla.o
 
 <div class="flex-container team-photos-container">
     <div class="team-member">
-        <h3>Adam Harvey</h4>
+        <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 counter-surveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups) and is a currently researcher in residence at Karlsruhe HfG.</p>
         <p><a href="https://ahprojects.com">ahprojects.com</a></p>
         </p>
@@ -42,29 +42,37 @@ The MegaPixels site is made possible with support from <a href="http://mozilla.o
     </div>
 </div>
 
-MegaPixels.cc is an independent research project about publicly available face recognition datasets. This website is based, in part, on earlier installations and research project about facial recognition datasets in 2016-2018, in particular the MegaFace dataset. Since then it has evolved into a large-scale survey and analysis of publicly available face and person analysis dataset usage, geographies, and ethics.
+MegaPixels.cc is an independent research project about publicly available face recognition datasets. This website is based, in part, on earlier installations and research projects about facial recognition datasets in 2016-2018, which focused particularly on the MegaFace dataset. Since then it has evolved into a large-scale survey of publicly-available face and person analysis datasets, covering their usage, geographies, and ethics.
 
-An academic report and presentation on the findings is forthcoming. This site is published to make the research more accessible to a wider audience and to include visualizations and interactive features not possible in PDF publications. Continued research on MegaPixles is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG.
+An academic report and presentation on the findings is forthcoming. This site is published to make the research more accessible to a wider audience and to include visualizations and interactive features not possible in PDF publications. Continued research on MegaPixels is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG.
 
 When possible, and once thoroughly verified, data generated for MegaPixels will be made available for download on [github.com/adamhrv/megapixels](https://github.com/adamhrv/megapixels)
 
+=== columns 3
+
 #### Team
 
 - Adam Harvey: Concept, research, design, computer vision
 - Jules LaPlace: Information and systems architecture, data retrieval, web applications
 
+===========
+
 #### Contributing Researchers
 
 - Berit Gilma: Dataset statistics and discovery
 - Beth (aka Ms. Celeb): Dataset usage verification and research
 - Mathana Stender: Commercial usage verification and research on LFW
 
+===========
+
 #### Code and Libraries
 
 - [Semantic Scholar](https://semanticscholar.org) for citation aggregation
 - Leaflet.js for maps
 - C3.js for charts
-- D3.js and ThreeJS for 3D visualizations
+- ThreeJS for 3D visualizations
 - PDFMiner.Six and Pandas for research paper data analysis
 
+=== end columns
+
 Please direct questions, comments, or feedback to [mastodon.social/@adamhrv](https://mastodon.social/@adamhrv)
\ No newline at end of file
diff --git a/site/public/about/index.html b/site/public/about/index.html
index 5b98ab34..18ad797a 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -39,7 +39,7 @@
 <p>The MegaPixels site is made possible with support from <a href="http://mozilla.org">Mozilla</a></p>
 <div class="flex-container team-photos-container">
    <div class="team-member">
-       <h3>Adam Harvey</h4>
+       <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 counter-surveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups) and is a currently researcher in residence at Karlsruhe HfG.</p>
        <p><a href="https://ahprojects.com">ahprojects.com</a></p>
        </p>
@@ -50,29 +50,29 @@
        </p>
        <p><a href="https://asdf.us/">asdf.us</a></p>
    </div>
-</div><p>MegaPixels.cc is an independent research project about publicly available face recognition datasets. This website is based, in part, on earlier installations and research project about facial recognition datasets in 2016-2018, in particular the MegaFace dataset. Since then it has evolved into a large-scale survey and analysis of publicly available face and person analysis dataset usage, geographies, and ethics.</p>
-<p>An academic report and presentation on the findings is forthcoming. This site is published to make the research more accessible to a wider audience and to include visualizations and interactive features not possible in PDF publications. Continued research on MegaPixles is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG.</p>
+</div><p>MegaPixels.cc is an independent research project about publicly available face recognition datasets. This website is based, in part, on earlier installations and research projects about facial recognition datasets in 2016-2018, which focused particularly on the MegaFace dataset. Since then it has evolved into a large-scale survey of publicly-available face and person analysis datasets, covering their usage, geographies, and ethics.</p>
+<p>An academic report and presentation on the findings is forthcoming. This site is published to make the research more accessible to a wider audience and to include visualizations and interactive features not possible in PDF publications. Continued research on MegaPixels is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG.</p>
 <p>When possible, and once thoroughly verified, data generated for MegaPixels will be made available for download on <a href="https://github.com/adamhrv/megapixels">github.com/adamhrv/megapixels</a></p>
-<h4>Team</h4>
+</section><section><div class='columns columns-3'><div class='column'><h4>Team</h4>
 <ul>
 <li>Adam Harvey: Concept, research, design, computer vision</li>
 <li>Jules LaPlace: Information and systems architecture, data retrieval, web applications</li>
 </ul>
-<h4>Contributing Researchers</h4>
+</div><div class='column'><h4>Contributing Researchers</h4>
 <ul>
 <li>Berit Gilma: Dataset statistics and discovery</li>
 <li>Beth (aka Ms. Celeb): Dataset usage verification and research</li>
 <li>Mathana Stender: Commercial usage verification and research on LFW</li>
 </ul>
-<h4>Code and Libraries</h4>
+</div><div class='column'><h4>Code and Libraries</h4>
 <ul>
 <li><a href="https://semanticscholar.org">Semantic Scholar</a> for citation aggregation</li>
 <li>Leaflet.js for maps</li>
 <li>C3.js for charts</li>
-<li>D3.js and ThreeJS for 3D visualizations</li>
+<li>ThreeJS for 3D visualizations</li>
 <li>PDFMiner.Six and Pandas for research paper data analysis</li>
 </ul>
-<p>Please direct questions, comments, or feedback to <a href="https://mastodon.social/@adamhrv">mastodon.social/@adamhrv</a></p>
+</div></div></section><section><p>Please direct questions, comments, or feedback to <a href="https://mastodon.social/@adamhrv">mastodon.social/@adamhrv</a></p>
 </section>
 
   </div>
-- 
cgit v1.2.3-70-g09d2


From 0f2aa955e880dbcb8a1526c09ca9271740ed14f7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 31 Mar 2019 16:57:12 +0200
Subject: columns

---
 site/assets/css/css.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'site')

diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index b9e99efe..260a495f 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -879,9 +879,11 @@ ul.map-legend li.source:before {
 }
 .columns-3 .column {
   width: 33%;
-  padding-right: 20px;
   font-family: Roboto, sans-serif;
   font-weight: 400;
+  background: #202020;
+  padding: 15px;
+  margin: 10px;
 }
 
 /* about page */
-- 
cgit v1.2.3-70-g09d2


From 189095364daf877f63ce075dc7d98edd7036572d Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 31 Mar 2019 16:57:58 +0200
Subject: columns

---
 site/assets/css/css.css | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'site')

diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 260a495f..0bb1f885 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -877,14 +877,22 @@ ul.map-legend li.source:before {
   flex-direction: row;
   justify-content: flex-start;
 }
-.columns-3 .column {
-  width: 33%;
+.columns .column {
   font-family: Roboto, sans-serif;
   font-weight: 400;
   background: #202020;
   padding: 15px;
   margin: 10px;
 }
+.columns-2 .column {
+  width: 50%;
+}
+.columns-3 .column {
+  width: 33%;
+}
+.columns-4 .column {
+  width: 25%;
+}
 
 /* about page */
 
-- 
cgit v1.2.3-70-g09d2


From 5a9fd63a7efc9b416ba4e5ce4ef9170a4be761ca Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 31 Mar 2019 16:58:27 +0200
Subject: columns

---
 site/assets/css/css.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'site')

diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 0bb1f885..c3800315 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -884,6 +884,9 @@ ul.map-legend li.source:before {
   padding: 15px;
   margin: 10px;
 }
+.columns .column:first-of-type {
+  margin-left: 0;
+}
 .columns-2 .column {
   width: 50%;
 }
-- 
cgit v1.2.3-70-g09d2


From 103b816c4fb80ca010f39266bf8836b47907a91a Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 31 Mar 2019 17:00:35 +0200
Subject: columns

---
 site/content/pages/about/faq.md     | 12 +++++-------
 site/content/pages/about/privacy.md |  7 +++----
 site/content/pages/about/terms.md   |  7 +++----
 3 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'site')

diff --git a/site/content/pages/about/faq.md b/site/content/pages/about/faq.md
index cec53813..d5858103 100644
--- a/site/content/pages/about/faq.md
+++ b/site/content/pages/about/faq.md
@@ -15,14 +15,12 @@ authors: Adam Harvey
 
 <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>
+<li><a href="/about/">About</a></li>
+<li><a class="current" href="/about/faq/">FAQs</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
-
 [ page under development ]
diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md
index e36daf2a..48598623 100644
--- a/site/content/pages/about/privacy.md
+++ b/site/content/pages/about/privacy.md
@@ -16,11 +16,10 @@ authors: Adam Harvey
 <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 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>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a class="current" href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
index 7ae6dac7..e03bafaa 100644
--- a/site/content/pages/about/terms.md
+++ b/site/content/pages/about/terms.md
@@ -17,11 +17,10 @@ authors: Adam Harvey
 <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 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>
+<li><a class="current" href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
-- 
cgit v1.2.3-70-g09d2


From 5eb849e37e0c902743a8b1178b652a14d9848e74 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 31 Mar 2019 17:12:41 +0200
Subject: update about menu

---
 site/content/pages/about/press.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'site')

diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index 47e1af52..a0780d64 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -16,11 +16,10 @@ authors: Adam Harvey
 <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/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>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
-- 
cgit v1.2.3-70-g09d2


From 869701acaa7cd6a3f370121e183c3322f6973c58 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Sun, 31 Mar 2019 17:28:39 +0200
Subject: editing about pages

---
 site/content/pages/about/disclaimer.md | 41 ----------------------------------
 site/content/pages/about/faq.md        | 13 +++++------
 site/content/pages/about/press.md      |  7 +++---
 site/content/pages/about/privacy.md    |  7 +++---
 site/content/pages/about/terms.md      |  7 +++---
 5 files changed, 15 insertions(+), 60 deletions(-)
 delete mode 100644 site/content/pages/about/disclaimer.md

(limited to 'site')

diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md
deleted file mode 100644
index f82a09a0..00000000
--- a/site/content/pages/about/disclaimer.md
+++ /dev/null
@@ -1,41 +0,0 @@
-------------
-
-status: published
-title: Disclaimer
-desc: MegaPixels Disclaimer
-slug: disclaimer
-cssclass: about
-published: 2018-12-04
-updated: 2018-12-04
-authors: Adam Harvey
- 
-------------
-
-# Disclaimer
-
-<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>
-
-(TEMPORARY PAGE)
-
-Last updated: December 04, 2018
-
-The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only.
-
-MegaPixels.cc assumes no responsibility for errors or omissions in the contents on the Service.
-
-In no event shall MegaPixels.cc be liable for any special, direct, indirect, consequential, or incidental damages or any damages whatsoever, whether in an action of contract, negligence or other tort, arising out of or in connection with the use of the Service or the contents of the Service. MegaPixels.cc reserves the right to make additions, deletions, or modification to the contents on the Service at any time without prior notice. 
-
-## External links disclaimer
-
-MegaPixels.cc website may contain links to external websites that are not provided or maintained by or in any way affiliated with MegaPixels.cc
-
-Please note that the MegaPixels.cc does not guarantee the accuracy, relevance, timeliness, or completeness of any information on these external websites.
diff --git a/site/content/pages/about/faq.md b/site/content/pages/about/faq.md
index cec53813..a0422d10 100644
--- a/site/content/pages/about/faq.md
+++ b/site/content/pages/about/faq.md
@@ -3,7 +3,7 @@
 status: published
 title: MegaPixels Press and News
 desc: MegaPixels Press and News
-slug: press
+slug: faqs
 cssclass: about
 published: 2018-12-04
 updated: 2018-12-04
@@ -15,12 +15,11 @@ authors: Adam Harvey
 
 <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>
+<li><a href="/about/">About</a></li>
+<li><a class="current" href="/about/faq/">FAQs</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index 47e1af52..a0780d64 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -16,11 +16,10 @@ authors: Adam Harvey
 <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/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>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md
index e36daf2a..48598623 100644
--- a/site/content/pages/about/privacy.md
+++ b/site/content/pages/about/privacy.md
@@ -16,11 +16,10 @@ authors: Adam Harvey
 <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 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>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a class="current" href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
index 7ae6dac7..e03bafaa 100644
--- a/site/content/pages/about/terms.md
+++ b/site/content/pages/about/terms.md
@@ -17,11 +17,10 @@ authors: Adam Harvey
 <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 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>
+<li><a class="current" href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
-- 
cgit v1.2.3-70-g09d2


From 438cde0ab82cf9fdbdcbb45e0ad8e43efc3525bb Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 31 Mar 2019 17:40:44 +0200
Subject: hide pdf

---
 client/chart/pie.charts.js           |  5 ++++-
 client/index.js                      |  4 ++--
 client/map/index.js                  |  8 ++++----
 scraper/client/paper/paper.verify.js | 14 ++++++++++----
 site/assets/css/applets.css          | 12 +++++++++++-
 site/public/about/faq/index.html     | 11 +++++------
 site/public/about/press/index.html   |  7 +++----
 site/public/about/privacy/index.html |  7 +++----
 site/public/about/terms/index.html   |  7 +++----
 9 files changed, 45 insertions(+), 30 deletions(-)

(limited to 'site')

diff --git a/client/chart/pie.charts.js b/client/chart/pie.charts.js
index 6e579537..84e85c3a 100644
--- a/client/chart/pie.charts.js
+++ b/client/chart/pie.charts.js
@@ -17,6 +17,7 @@ class PieCharts extends Component {
   render() {
     const { payload } = this.props
     const { paper, citations } = payload.data
+    console.log(this.props)
     if (!citations.length) return null
 
     const countries = {}
@@ -83,9 +84,10 @@ class PieCharts extends Component {
               }
             }}
             size={{
-              height: 336,
+              height: countryRows.length < 4 ? 316 : 336,
             }}
           />
+          <span className='chartCaption'>{paper.name}{' dataset citations by country'}</span>
         </div>
         <div>
           <C3Chart
@@ -105,6 +107,7 @@ class PieCharts extends Component {
               height: 316,
             }}
           />
+          <span className='chartCaption'>{paper.name}{' dataset citations by organization type'}</span>
         </div>
       </div>
     )
diff --git a/client/index.js b/client/index.js
index 5c8bc880..5a7315b5 100644
--- a/client/index.js
+++ b/client/index.js
@@ -87,9 +87,9 @@ function runApplets() {
         if (dataset === 'index.html') {
           dataset = path.pop()
         }
-        console.log('dataset from path:', dataset)
+        // console.log('dataset from path:', dataset)
       } else {
-        console.log('not on a dataset page')
+        // console.log('not on a dataset page')
         return [el, payload]
       }
     }
diff --git a/client/map/index.js b/client/map/index.js
index 9ca43867..475ba3c6 100644
--- a/client/map/index.js
+++ b/client/map/index.js
@@ -104,10 +104,10 @@ export default function append(el, payload) {
   let citationsByAddress = {}
   citations.forEach(citation => {
     if (!citation.addresses) {
-      console.log(citation)
+      // console.log(citation)
       return
     }
-    console.log(citation)
+    // console.log(citation)
     citation.addresses.forEach(address => {
       if (!(address.name in citationsByAddress)) {
         citationsByAddress[address.name] = { address, citations: []}
@@ -118,7 +118,7 @@ export default function append(el, payload) {
 
   Object.keys(citationsByAddress).map(name => {
     const { citations: citationList, address: citationAddress } = citationsByAddress[name]
-    console.log(name, citationsByAddress[name])
+    // console.log(name, citationsByAddress[name])
     // console.log(citation)
     const latlng = [citationAddress.lat, citationAddress.lng].map(n => parseFloat(n))
     if (Number.isNaN(latlng[0]) || Number.isNaN(latlng[1])) return
@@ -135,7 +135,7 @@ export default function append(el, payload) {
     addArc(map, source, latlng, style)
   })
 
-  console.log(paper)
+  // console.log(paper)
 
   const rootMarker = addMarker(map, source, [paper])
   rootMarker.openPopup()
diff --git a/scraper/client/paper/paper.verify.js b/scraper/client/paper/paper.verify.js
index 83eb5b44..fcebac02 100644
--- a/scraper/client/paper/paper.verify.js
+++ b/scraper/client/paper/paper.verify.js
@@ -60,6 +60,7 @@ class PaperVerify extends Component {
         ...initialState,
         ...citationState,
         ...address.paper,
+        pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)),
       }
       this.setState(newState)
     } else if (verify && !verify.loading && verify.paper && (!oldPaper || oldPaper !== verify.paper)) {
@@ -70,6 +71,7 @@ class PaperVerify extends Component {
           ...initialState,
           ...citationState,
           ...address.paper,
+          pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)),
         }
         this.setState(newState)
       } else {
@@ -79,6 +81,7 @@ class PaperVerify extends Component {
         newState = {
           ...citationState,
           ...address.paper,
+          pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)),
           uses_dataset: paper.uses_dataset,
           images_in_paper: paper.images_in_paper,
           verified_by: paper.verified_by,
@@ -156,7 +159,7 @@ class PaperVerify extends Component {
       if (citationIndex < 0) {
         history.push('/paper/' + key + '/info/')
       } else {
-        let nextId = citations[citationIndex].id
+        let nextId = sortedCitations[citationIndex].id
         history.push('/paper/' + key + '/verify/' + nextId)
       }
     }
@@ -172,10 +175,10 @@ class PaperVerify extends Component {
       history.push('/paper/' + key + '/info/')
     } else {
       citationIndex += 1
-      if (citationIndex >= citations.length) {
+      if (citationIndex >= sortedCitations.length) {
         history.push('/paper/' + key + '/info/')
       } else {
-        let nextId = citations[citationIndex].id
+        let nextId = sortedCitations[citationIndex].id
         history.push('/paper/' + key + '/verify/' + nextId)
       }
     }
@@ -414,7 +417,10 @@ class PaperVerify extends Component {
           >{'Next >'}</button>
         </div>
 
-         <iframe className='pdfViewer' referrerPolicy='no-referrer' src={citation.pdf[this.state.pdf_index]} />
+        {citation.pdf.length
+        ? <iframe className='pdfViewer' referrerPolicy='no-referrer' src={citation.pdf[this.state.pdf_index] || "about:blank"} />
+        : ''
+        }
       </div>
     )
   }
diff --git a/site/assets/css/applets.css b/site/assets/css/applets.css
index 10c0e786..41d04783 100644
--- a/site/assets/css/applets.css
+++ b/site/assets/css/applets.css
@@ -222,6 +222,10 @@
 }
 .piechart .chart > div {
   width: 50%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
 }
 .piechart .chart .c3-chart-arc text {
   fill: #fff;
@@ -231,4 +235,10 @@
 }
 .piechart .c3 path, .piechart .c3 line {
   stroke: rgba(64,64,64,0.3);
-}
\ No newline at end of file
+}
+.piechart .chartCaption {
+  color: #888;
+  font-size: 12px;
+  font-family: 'Roboto', sans-serif;
+  font-weight: 400;
+}
diff --git a/site/public/about/faq/index.html b/site/public/about/faq/index.html
index 738759ab..b86dac22 100644
--- a/site/public/about/faq/index.html
+++ b/site/public/about/faq/index.html
@@ -29,12 +29,11 @@
   <section><h1>FAQs</h1>
 <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>
+<li><a href="/about/">About</a></li>
+<li><a class="current" href="/about/faq/">FAQs</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section><p>[ page under development ]</p>
 </section>
diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html
index e2e646da..3fc33969 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -30,11 +30,10 @@
 <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/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>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section><p>(TEMPORARY PAGE)</p>
 <ul>
diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html
index f6915d66..2e1b3349 100644
--- a/site/public/about/privacy/index.html
+++ b/site/public/about/privacy/index.html
@@ -30,11 +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 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>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a class="current" href="/about/privacy/">Privacy</a></li>
 </ul>
 </section><p>(TEMPORARY PAGE)</p>
 <p>A summary of our privacy policy is as follows:</p>
diff --git a/site/public/about/terms/index.html b/site/public/about/terms/index.html
index b86eae88..58e49b78 100644
--- a/site/public/about/terms/index.html
+++ b/site/public/about/terms/index.html
@@ -30,11 +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 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>
+<li><a class="current" href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section><p>(TEMPORARY PAGE)</p>
 <p>(FPO: this is only example text)</p>
-- 
cgit v1.2.3-70-g09d2


From 2e73ee5f56d02ee1dc3dbf384d71081c714a0491 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Sun, 31 Mar 2019 17:45:33 +0200
Subject: add tmp msceleb

---
 .../pages/datasets/msceleb/assets/background.jpg   | Bin 0 -> 422970 bytes
 .../pages/datasets/msceleb/assets/index.jpg        | Bin 0 -> 39839 bytes
 site/content/pages/datasets/msceleb/index.md       |  56 +++++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 site/content/pages/datasets/msceleb/assets/background.jpg
 create mode 100644 site/content/pages/datasets/msceleb/assets/index.jpg
 create mode 100644 site/content/pages/datasets/msceleb/index.md

(limited to 'site')

diff --git a/site/content/pages/datasets/msceleb/assets/background.jpg b/site/content/pages/datasets/msceleb/assets/background.jpg
new file mode 100644
index 00000000..c1cd486e
Binary files /dev/null and b/site/content/pages/datasets/msceleb/assets/background.jpg differ
diff --git a/site/content/pages/datasets/msceleb/assets/index.jpg b/site/content/pages/datasets/msceleb/assets/index.jpg
new file mode 100644
index 00000000..fb3a934a
Binary files /dev/null and b/site/content/pages/datasets/msceleb/assets/index.jpg differ
diff --git a/site/content/pages/datasets/msceleb/index.md b/site/content/pages/datasets/msceleb/index.md
new file mode 100644
index 00000000..eb084eaa
--- /dev/null
+++ b/site/content/pages/datasets/msceleb/index.md
@@ -0,0 +1,56 @@
+------------
+
+status: published
+title: MS Celeb
+desc: MS Celeb is a dataset of web images used for training and evaluating face recognition algorithms
+subdesc: The MS Celeb dataset includes over 10,000,000 images and 93,000 identities of semi-public figures collected using the Bing search engine
+slug: msceleb
+cssclass: dataset
+image: assets/background.jpg
+year: 2015
+published: 2019-2-23
+updated: 2019-2-23
+authors: Adam Harvey
+
+------------
+
+### sidebar
+
++ Published: TBD
++ Images: TBD
++ Faces: TBD
++ Created by: TBD
+
+
+## Microsoft Celeb Dataset (MS Celeb)
+
+(PAGE UNDER DEVELOPMENT)
+
+At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. 
+
+Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat
+
+{% include 'chart.html' %}
+
+{% include 'piechart.html' %}
+
+{% include 'map.html' %}
+
+Add more analysis here
+
+
+{% include 'supplementary_header.html' %}
+
+{% include 'citations.html' %}
+
+
+### Additional Information
+
+- The dataset author spoke about his research at the CVPR conference in 2016 <https://www.youtube.com/watch?v=Nl2fBKxwusQ>
+
+
+### Footnotes
+
+[^readme]: "readme.txt" https://exhibits.stanford.edu/data/catalog/sx925dc9385.
+[^localized_region_context]: Li, Y. and Dou, Y. and Liu, X. and Li, T. Localized Region Context and Object Feature Fusion for People Head Detection. ICIP16 Proceedings. 2016. Pages 594-598.
+[^replacement_algorithm]: Zhao. X, Wang Y, Dou, Y. A Replacement Algorithm of Non-Maximum Suppression Base on Graph Clustering. 
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 5366253cc74b6df84cd0923220d288dc7385e111 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Sun, 31 Mar 2019 18:55:38 +0200
Subject: change gov/mil to mil/gov

---
 client/chart/constants.js    |  4 ++--
 site/includes/citations.html |  3 +--
 site/includes/map.html       |  6 +++---
 site/includes/piechart.html  |  7 -------
 todo.md                      | 34 +++++++++++++---------------------
 5 files changed, 19 insertions(+), 35 deletions(-)

(limited to 'site')

diff --git a/client/chart/constants.js b/client/chart/constants.js
index 70375ba3..b916cbd2 100644
--- a/client/chart/constants.js
+++ b/client/chart/constants.js
@@ -59,6 +59,6 @@ export const institutionOrder = {
 export const institutionLabels = {
   'edu': 'Academic',
   'company': 'Commercial',
-  'gov': 'Government / Military',
-  'mil': 'Government / Military',
+  'gov': 'Military / Government',
+  'mil': 'Military / Government',
 }
\ No newline at end of file
diff --git a/site/includes/citations.html b/site/includes/citations.html
index 058a1834..f15c5148 100644
--- a/site/includes/citations.html
+++ b/site/includes/citations.html
@@ -2,8 +2,7 @@
 
   <h3>Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
diff --git a/site/includes/map.html b/site/includes/map.html
index 74771768..867ada4c 100644
--- a/site/includes/map.html
+++ b/site/includes/map.html
@@ -18,15 +18,15 @@
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
diff --git a/site/includes/piechart.html b/site/includes/piechart.html
index e739bb28..94c8aae7 100644
--- a/site/includes/piechart.html
+++ b/site/includes/piechart.html
@@ -1,10 +1,3 @@
-<section>
-  <p>
-    These pie charts show overall totals based on country and institution type.
-  </p>
- 
- </section>
-
 <section class="applet_container">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section>
diff --git a/todo.md b/todo.md
index d6f76c85..c2941ff0 100644
--- a/todo.md
+++ b/todo.md
@@ -1,43 +1,35 @@
 # TODO
 
-## Paper Review
-
-- build and deploy paper verification tool to publicly (but password protected) URL
-- add field for name (no site registration needed)
-- user can maually add their name, so it can be used for double-verification, accountability
-- top priority datasets will probably be: DukeMTMC, UCCS, MegaFace, Brainwash, HRT Transgender, IJB-C, VGG Face 2, MS Celeb, Pipa, 
-
 ## Splash
 
 - AH: work on CTA overlay design
-- AH: render one head from each activate dataset
+- AH: render heads from IJB-C, and MS Celeb
+- AH: create psuedo-ranomized list of names from combined datasets for word/name cloud
 - JL: add "Name \n Dataset Name" below head? and make linkable to dataset?
 - change animation to be only colored vertices <---> colored landmarks
 - add scripted slow-slow-zoom out effect
 
 ## Datasets Index
 
-- AH: add more datasets
-- AH: finalize intro text
+- AH: add dataset analysis for MS Celeb, Duke, UCCS, IJB-C, Brainwash, HRT Transgender
+- AH: increase sizes of dataset thumbnails
+- AH: add license information to each dataset page
 
 ## Datasets
 
-- AH: Try creating another google doc to manually review each citation and send to FT to maybe help with review
+Higher priority:
+
 - AH: finalize text for map include, beta disclaimer
 - JL: add download (button) and search option for CSV? or link to github
 - JL: remove pointer rollover on tabulators
 - JL: change PDF url to only show domain (ie https:/arxiv.org/12345/ --> arxiv.org)
-- JL: check footnotes (it shows an 'a' next to the numbers on bottom. is this right?)
-- JL: Add 'sticky' title appear in header zone when scrolling down page (like NYT)
-- JL: add total number of citations next to country "China (1,234)"
-- JL: possible to add country with most citations in the "Who Used Dataset" paragraph?
-- JL: time permitting, add C3 Pie Graph include:
-    - one pie graph for citations by country
-    - one pie graph for citations by sector (academic, commericial, military)
-- Integrate verified citations and show only verified citations
-- JL/AH: integrate new sidebar JSON or CSV data (AH, working on this...)
-- NB: skipping synthetic faces for now
+- JL/AH: integrate new sidebar JSON or CSV data (AH, working on this...) to show dataset statistics
+
+Lower priority:
+
+- JL: Add 'sticky' title with Dataset  appear in header zone when scrolling down page (like NYT)
 
+ 
 ## About
 
 - AH: update bio images
-- 
cgit v1.2.3-70-g09d2


From 0bede27de3bcc0c7f03d16c7607a0ae693daebc7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 10:23:29 +0200
Subject: citations table in react

---
 client/applet.js                        |   7 +-
 client/index.js                         |   4 +-
 client/table/citations.table.js         |  53 ++++++++++++
 client/table/file.table.js              |  59 +++++++++++++
 client/table/index.js                   |  10 +++
 client/tables.js                        |  96 ---------------------
 package-lock.json                       |  90 +++++++++++++++++++-
 package.json                            |   1 +
 site/includes/citations.html            |   2 +-
 site/public/datasets/index.html         |  12 +++
 site/public/datasets/msceleb/index.html | 143 ++++++++++++++++++++++++++++++++
 11 files changed, 373 insertions(+), 104 deletions(-)
 create mode 100644 client/table/citations.table.js
 create mode 100644 client/table/file.table.js
 create mode 100644 client/table/index.js
 delete mode 100644 client/tables.js
 create mode 100644 site/public/datasets/msceleb/index.html

(limited to 'site')

diff --git a/client/applet.js b/client/applet.js
index 21e1e4fa..db95168a 100644
--- a/client/applet.js
+++ b/client/applet.js
@@ -4,11 +4,12 @@ import { Container as FaceSearchContainer } from './faceSearch'
 import { Container as FaceAnalysisContainer } from './faceAnalysis'
 import { Container as NameSearchContainer } from './nameSearch'
 import { Container as DatasetListContainer } from './datasetList'
+import { CitationsTable, FileTable } from './table'
 import { CountriesByYear, PieCharts } from './chart'
 
 export default class Applet extends Component {
   render() {
-    // console.log(this.props)
+    // console.log(this.props.payload.cmd)
     switch (this.props.payload.cmd) {
       case 'face_analysis':
         return <FaceAnalysisContainer {...this.props} />
@@ -22,6 +23,10 @@ export default class Applet extends Component {
         return <CountriesByYear {...this.props} />
       case 'piechart':
         return <PieCharts {...this.props} />
+      case 'citations':
+        return <CitationsTable {...this.props} />
+      case 'load_file':
+        return <FileTable {...this.props} />
       default:
         return <pre style={{ color: '#0f0' }}>{'Megapixels'}</pre>
     }
diff --git a/client/index.js b/client/index.js
index 5a7315b5..668aebfb 100644
--- a/client/index.js
+++ b/client/index.js
@@ -6,7 +6,6 @@ import { Provider } from 'react-redux'
 import { toArray } from './util'
 import Applet from './applet'
 import { store } from './store'
-import appendTable from './tables'
 import appendMap from './map'
 
 function appendReactApplet(el, payload) {
@@ -33,7 +32,8 @@ function appendApplets(applets) {
       case 'citations':
       case 'load_file':
         el.parentNode.classList.add('wide')
-        appendTable(el, payload)
+        appendReactApplet(el, payload)
+        el.classList.add('loaded')
         break
       case 'map':
         el.parentNode.classList.add('wide')
diff --git a/client/table/citations.table.js b/client/table/citations.table.js
new file mode 100644
index 00000000..1ec2d10c
--- /dev/null
+++ b/client/table/citations.table.js
@@ -0,0 +1,53 @@
+import React, { Component } from 'react'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { ReactTabulator } from 'react-tabulator'
+import { Loader } from '../common'
+import { toArray, toTuples } from '../util'
+
+export const citationsColumns = [
+  { title: 'Title', field: 'title', sorter: 'string' },
+  { title: 'Institution', field: 'institution', sorter: 'string' },
+  { title: 'Country', field: 'country', sorter: 'string', width: 140 },
+  { title: 'Year', field: 'year', sorter: 'number', width: 70 },
+  { title: 'PDF', field: 'pdf_text', formatter: 'link',
+    formatterParams: { target: "_blank", urlField: 'pdf_link', },
+    sorter: 'string', width: 100 },
+]
+
+class CitationsTable extends Component {
+  render() {
+    const { payload } = this.props
+    const { paper, citations } = payload.data
+    console.log(this.props)
+    if (!citations.length) return <Loader />
+
+    const formattedCitations = citations.map(citation => ({
+      title: citation.title,
+      institution: citation.addresses[0].name,
+      country: citation.addresses[0].country,
+      year: citation.year,
+      pdf: (citation.pdf && citation.pdf.length)
+        ? citation.pdf[0]
+        : (citation.doi && citation.doi.length)
+          ? citation.doi[0]
+          : "",
+    }))
+
+    console.log(formattedCitations)
+
+    return (
+      <ReactTabulator
+        columns={citationsColumns}
+        data={formattedCitations}
+        options={{
+          height: 311,
+          layout: 'fitColumns',
+          placeholder: 'No Data Set',
+        }}
+      />
+    )
+  }
+}
+
+export default CitationsTable
diff --git a/client/table/file.table.js b/client/table/file.table.js
new file mode 100644
index 00000000..a7e25bbf
--- /dev/null
+++ b/client/table/file.table.js
@@ -0,0 +1,59 @@
+import React, { Component } from 'react'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { toArray, toTuples } from '../util'
+
+import { Loader } from '../common'
+
+import csv from 'parse-csv'
+
+class FileTable extends Component {
+  state = {
+    data: []
+  }
+  
+  componentDidMount() {
+    fetch(payload.url, { mode: 'cors' })
+      .then(r => r.text())
+      .then(text => {
+        try {
+          const data = csv.toJSON(text, { headers: { included: true } })
+          this.setState({ data })
+        } catch (e) {
+          console.error("error making json:", payload.url)
+          console.error(e)
+        }
+      })
+  }
+
+  getColumns(payload) {
+    let { cmd, url, fields } = payload
+    return ((fields && fields.length) ? fields[0] : '').split(', ').map(field => {
+      switch (field) {
+        default:
+          return { title: field, field: field.toLowerCase(), sorter: 'string' }
+      }
+    })
+  }
+
+  render() {
+    const { payload } = this.props
+    const { paper, citations } = payload.data
+    const columns = getColumns(payload)
+    if (!this.state.data.length) {
+      return <Loader />
+    }
+    return (
+      <ReactTabulator
+        columns={citationsColumns}
+        data={this.state.data}
+        options={{
+          height: 311,
+          layout: 'fitColumns',
+          placeholder: 'No Data Set',
+        }}
+      />
+    )
+  }
+}
+export default FileTable
diff --git a/client/table/index.js b/client/table/index.js
new file mode 100644
index 00000000..43db7dbb
--- /dev/null
+++ b/client/table/index.js
@@ -0,0 +1,10 @@
+import 'react-tabulator/lib/styles.css'
+import 'react-tabulator/lib/css/tabulator.min.css'
+
+import CitationsTable from './citations.table'
+import FileTable from './file.table'
+
+export {
+  CitationsTable,
+  FileTable,
+}
\ No newline at end of file
diff --git a/client/tables.js b/client/tables.js
deleted file mode 100644
index 3b53b5db..00000000
--- a/client/tables.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import Tabulator from 'tabulator-tables'
-import csv from 'parse-csv'
-
-const datasetColumns = [
-  { title: 'Title', field: 'title', sorter: 'string' },
-  { title: 'Images', field: 'images', sorter: 'number' },
-  { title: 'People', field: 'people', sorter: 'number' },
-  { title: 'Year', field: 'year', sorter: 'number' },
-  { title: 'Citations', field: 'citations', sorter: 'number' },
-  { title: 'Influenced', field: 'influenced', sorter: 'number' },
-  // { title: 'Origin', field: 'origin', sorter: 'string' },
-]
-const citationsColumns = [
-  { title: 'Title', field: 'title', sorter: 'string' },
-  { title: 'Institution', field: 'institution', sorter: 'string' },
-  { title: 'Country', field: 'country', sorter: 'string', width: 140 },
-  { title: 'Year', field: 'year', sorter: 'number', width: 70 },
-  { title: 'PDF', field: 'pdf', formatter: 'link',
-    formatterParams: { target: "_blank", urlField: 'pdf', },
-    sorter: 'string', width: 100 },
-]
-
-function getColumns(payload) {
-  let { cmd, url, fields } = payload
-  if (cmd === 'citations') {
-    return citationsColumns
-  }
-  if (url && url.match('datasets.csv')) {
-    return datasetColumns
-  }
-  return ((fields && fields.length) ? fields[0] : '').split(', ').map(field => {
-    switch (field) {
-      default:
-        return { title: field, field: field.toLowerCase(), sorter: 'string' }
-    }
-  })
-}
-
-function getCitations(dataset) {
-  // console.log(dataset.citations)
-  // console.log(dataset.citations.map(d => [d.pdf, d.doi]))
-  return dataset.citations.map(citation => ({
-    title: citation.title,
-    institution: citation.addresses[0].name,
-    country: citation.addresses[0].country,
-    year: citation.year,
-    pdf: (citation.pdf && citation.pdf.length)
-      ? citation.pdf[0]
-      : (citation.doi && citation.doi.length)
-        ? citation.doi[0]
-        : "",
-  }))
-}
-
-export default function append(el, payload) {
-  const columns = getColumns(payload)
-  // console.log(columns)
-  const table = new Tabulator(el, {
-    height: '311px',
-    layout: 'fitColumns',
-    placeholder: 'No Data Set',
-    columns,
-  })
-  // let path = payload.opt
-  // console.log(path, columns)
-
-  if (payload.cmd === 'citations') {
-    let { data } = payload
-    if (!data) return null
-    const citations = getCitations(data)
-    // console.log(citations)
-    table.setData(citations)
-    el.classList.add('loaded')
-  } else {
-    fetch(payload.url, { mode: 'cors' })
-      .then(r => r.text())
-      .then(text => {
-        try {
-          // console.log(text)
-          const data = csv.toJSON(text, { headers: { included: true } })
-          // console.log(data)
-          table.setData(data)
-          el.classList.add('loaded')
-        } catch (e) {
-          
-          console.error("error making json:", payload.url)
-          console.error(e)
-          // console.log(text)
-        }
-      })
-  }
-
-  // if (fields && fields.length > 1 && fields[1].indexOf('filter')) {
-  //   const filter = fields[1].split(' ')
-  // }
-}
diff --git a/package-lock.json b/package-lock.json
index 6d36e3ff..4e9d6fac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -216,6 +216,28 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.38.tgz",
       "integrity": "sha512-EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A=="
     },
+    "@types/prop-types": {
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.0.tgz",
+      "integrity": "sha512-eItQyV43bj4rR3JPV0Skpl1SncRCdziTEK9/v8VwXmV6d/qOUO8/EuWeHBbCZcsfSHfzI5UyMJLCSXtxxznyZg=="
+    },
+    "@types/react": {
+      "version": "16.8.10",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.10.tgz",
+      "integrity": "sha512-7bUQeZKP4XZH/aB4i7k1i5yuwymDu/hnLMhD9NjVZvQQH7ZUgRN3d6iu8YXzx4sN/tNr0bj8jgguk8hhObzGvA==",
+      "requires": {
+        "@types/prop-types": "*",
+        "csstype": "^2.2.0"
+      }
+    },
+    "@types/react-tag-autocomplete": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@types/react-tag-autocomplete/-/react-tag-autocomplete-5.6.0.tgz",
+      "integrity": "sha512-EsUrbpKW5agXs/NbMUQRgwtZInQbUIIPBXiUz+XcJeUP7U6BRCWjw96sQmsEPRUwO0CdPfQEd82zwpCIGEr4Ew==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
     "accepts": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
@@ -2249,6 +2271,11 @@
       "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
       "dev": true
     },
+    "csstype": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.3.tgz",
+      "integrity": "sha512-rINUZXOkcBmoHWEyu7JdHu5JMzkGRoMX4ov9830WNgxf5UYxcBUO0QTKAqeJ5EZfSdlrcJYkC8WwfVW7JYi4yg=="
+    },
     "csv-parse": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.2.0.tgz",
@@ -4647,6 +4674,11 @@
         "wbuf": "^1.1.0"
       }
     },
+    "html-attributes": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/html-attributes/-/html-attributes-1.1.0.tgz",
+      "integrity": "sha1-ggJ6T6x6YHDqbBjMOIauoY1t6gk="
+    },
     "html-entities": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
@@ -5594,9 +5626,9 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+      "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -5781,6 +5813,11 @@
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
       "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
     },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
     "lodash.merge": {
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
@@ -6710,6 +6747,16 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pick-react-known-prop": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/pick-react-known-prop/-/pick-react-known-prop-0.1.5.tgz",
+      "integrity": "sha512-SnDf64AVdvqoAFpHeZUKT9kdn40Ellj84CPALRxYWqNJ6r6f44eAAT+Jtkb0Suhiw7yg5BdOFAQ25OJnjG+afw==",
+      "requires": {
+        "html-attributes": "^1.1.0",
+        "lodash.isplainobject": "^4.0.6",
+        "svg-attributes": "^1.0.0"
+      }
+    },
     "pify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -7274,6 +7321,36 @@
         "spin.js": "^2.0.1"
       }
     },
+    "react-tabulator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/react-tabulator/-/react-tabulator-0.9.1.tgz",
+      "integrity": "sha512-KLkO17TZbGKzwaCPD8c84cG94OkSpU0zyvlhOleKJELQWcHEL99+63DEamEaXOsguDfxM474lxu3K+jqG2bW/Q==",
+      "requires": {
+        "@types/react-tag-autocomplete": "^5.6.0",
+        "date-fns": "v2.0.0-alpha.25",
+        "dotenv": "^6.1.0",
+        "pick-react-known-prop": "^0.1.5",
+        "react-tag-autocomplete": "^5.7.1",
+        "tabulator-tables": "^4.2.3"
+      },
+      "dependencies": {
+        "date-fns": {
+          "version": "2.0.0-alpha.25",
+          "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.0.0-alpha.25.tgz",
+          "integrity": "sha512-iQzJkHF0L4wah9Ae9PkvwemwFz6qmRLuNZcghmvf2t+ptLs1qXzONLiGtjmPQzL6+JpC01JjlTopY2AEy4NFAg=="
+        },
+        "tabulator-tables": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/tabulator-tables/-/tabulator-tables-4.2.3.tgz",
+          "integrity": "sha512-vMQ/8/HSKzOdn1zd9uv7EmnBnMTlX8JMhfxAxEUkM12qYiqhapWp/iN2ErtDX2cVi+4CUaEn61qydSFJyKjdYA=="
+        }
+      }
+    },
+    "react-tag-autocomplete": {
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/react-tag-autocomplete/-/react-tag-autocomplete-5.8.2.tgz",
+      "integrity": "sha512-GkOQrSLjvWo98IeqRuGgc77zaxSMyMjy+b2Rc+m9jMKTWopF9h5Lf2F/X1oK9hcnUCeUmJ5QVpc/dx9MgOA2Iw=="
+    },
     "read-pkg": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -8546,7 +8623,7 @@
     },
     "sprintf-js": {
       "version": "1.0.3",
-      "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
@@ -8722,6 +8799,11 @@
       "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
       "dev": true
     },
+    "svg-attributes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/svg-attributes/-/svg-attributes-1.0.0.tgz",
+      "integrity": "sha1-tcWWjzYke32+OFMgfyqcaK2Aa/w="
+    },
     "svgtodatauri": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/svgtodatauri/-/svgtodatauri-0.0.0.tgz",
diff --git a/package.json b/package.json
index 4cd2f10d..6238e7e3 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
     "react-spin": "^0.6.2",
+    "react-tabulator": "^0.9.1",
     "redux": "^4.0.0",
     "redux-thunk": "^2.3.0",
     "snapsvg": "^0.5.1",
diff --git a/site/includes/citations.html b/site/includes/citations.html
index 058a1834..d29812df 100644
--- a/site/includes/citations.html
+++ b/site/includes/citations.html
@@ -6,7 +6,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html
index f618e86b..03b38f8a 100644
--- a/site/public/datasets/index.html
+++ b/site/public/datasets/index.html
@@ -85,6 +85,18 @@
         </div>
       </a>
     
+      <a href="/datasets/msceleb/" style="background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/msceleb/assets/index.jpg)">
+        <div class="dataset">
+          <span class='title'>MS Celeb</span>
+          <div class='fields'>
+            <div class='year visible'><span>2016</span></div>
+            <div class='purpose'><span>face recognition</span></div>
+            <div class='images'><span>1,000,000  images</span></div>
+            <div class='identities'><span>100,000 </span></div>
+          </div>
+        </div>
+      </a>
+    
       <a href="/datasets/pipa/" style="background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/pipa/assets/index.jpg)">
         <div class="dataset">
           <span class='title'>People in Photo Albums</span>
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
new file mode 100644
index 00000000..8ebfe1a4
--- /dev/null
+++ b/site/public/datasets/msceleb/index.html
@@ -0,0 +1,143 @@
+<!doctype html>
+<html>
+<head>
+  <title>MegaPixels</title>
+  <meta charset="utf-8" />
+  <meta name="author" content="Adam Harvey" />
+  <meta name="description" content="MS Celeb is a dataset of web images used for training and evaluating face recognition algorithms" />
+  <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="/about/">About</a>
+    </div>
+  </header>
+  <div class="content content-dataset">
+    
+  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/msceleb/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>MS Celeb is a dataset of web images used for training and evaluating face recognition algorithms</span></div><div class='hero_subdesc'><span class='bgpad'>The MS Celeb dataset includes over 10,000,000 images and 93,000 identities of semi-public figures collected using the Bing search engine
+</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div><div><div class='gray'>Created by</div><div>TBD</div></div></div></div><h2>Microsoft Celeb Dataset (MS Celeb)</h2>
+<p>(PAGE UNDER DEVELOPMENT)</p>
+<p>At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.</p>
+<p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
+</section><section>
+  <h3>Who used MsCeleb?</h3>
+
+  <p>
+    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
+    to see yearly totals.  These charts show at most the top 10 countries.
+  </p>
+ 
+ </section>
+
+<section class="applet_container">
+<!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
+</div> -->
+ <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
+</section><section>
+  <p>
+    These pie charts show overall totals based on country and institution type.
+  </p>
+ 
+ </section>
+
+<section class="applet_container">
+ <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
+</section><section>
+	
+	<h3>Information Supply Chain</h3>
+<!-- 
+	<div class="map-sidebar right-sidebar">
+	  <h3>Legend</h3>
+	  <ul>
+	    <li><span style="color: #f2f293">&#9632;</span> Industry</li>
+	    <li><span style="color: #f30000">&#9632;</span> Academic</li>
+	    <li><span style="color: #3264f6">&#9632;</span> Government</li>
+	  </ul>
+	</div>
+	 -->
+	<p>
+		To understand how MsCeleb has been used around the world...
+		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+	</p>
+ 
+ </section>
+
+<section class="applet_container">
+ <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+</section>
+
+<div class="caption">
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
+</div>
+
+<section>
+	<p class='subp'>
+		[section under development] MsCeleb ... Standardized paragraph of text about the map. 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.
+	</p>
+</section><section><p>Add more analysis here</p>
+</section><section>
+
+
+  <div class="hr-wave-holder">
+      <div class="hr-wave-line hr-wave-line1"></div>
+      <div class="hr-wave-line hr-wave-line2"></div>
+  </div>
+
+  <h2>Supplementary Information</h2>
+</section><section class="applet_container">
+
+  <h3>Citations</h3>
+  <p>
+    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+  </p>
+  <p>
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+  </p>
+
+  <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
+</section><section><h3>Additional Information</h3>
+<ul>
+<li>The dataset author spoke about his research at the CVPR conference in 2016 <a href="https://www.youtube.com/watch?v=Nl2fBKxwusQ">https://www.youtube.com/watch?v=Nl2fBKxwusQ</a></li>
+</ul>
+</section><section><ul class="footnotes"><li><a name="[^readme]" class="footnote_shim"></a><span class="backlinks"></span><p>"readme.txt" <a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">https://exhibits.stanford.edu/data/catalog/sx925dc9385</a>.</p>
+</li><li><a name="[^localized_region_context]" class="footnote_shim"></a><span class="backlinks"></span><p>Li, Y. and Dou, Y. and Liu, X. and Li, T. Localized Region Context and Object Feature Fusion for People Head Detection. ICIP16 Proceedings. 2016. Pages 594-598.</p>
+</li><li><a name="[^replacement_algorithm]" class="footnote_shim"></a><span class="backlinks"></span><p>Zhao. X, Wang Y, Dou, Y. A Replacement Algorithm of Non-Maximum Suppression Base on Graph Clustering.</p>
+</li></ul></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
-- 
cgit v1.2.3-70-g09d2


From 0a9a618925f3de31c7e8a45b2f3f047000d74c37 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 10:26:52 +0200
Subject: rebuild

---
 site/public/datasets/50_people_one_question/index.html | 2 +-
 site/public/datasets/brainwash/index.html              | 2 +-
 site/public/datasets/celeba/index.html                 | 2 +-
 site/public/datasets/cofw/index.html                   | 2 +-
 site/public/datasets/duke_mtmc/index.html              | 2 +-
 site/public/datasets/hrt_transgender/index.html        | 2 +-
 site/public/datasets/lfw/index.html                    | 2 +-
 site/public/datasets/market_1501/index.html            | 2 +-
 site/public/datasets/msceleb/index.html                | 2 +-
 site/public/datasets/pipa/index.html                   | 2 +-
 site/public/datasets/uccs/index.html                   | 2 +-
 site/public/datasets/viper/index.html                  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'site')

diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index 9ed6d11e..0a9e8297 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -85,7 +85,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index fb08c168..46cefbe7 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -110,7 +110,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index a0f0c683..ca04062d 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -85,7 +85,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 640eab52..02d08278 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -95,7 +95,7 @@ To increase the number of training images, and since  COFW has the exact same la
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index 160888e2..27a17c94 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -106,7 +106,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index 8b870128..63647f9a 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -105,7 +105,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index dd94c8c5..532abc56 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -121,7 +121,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index b3170925..c2569b81 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -83,7 +83,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index 8ebfe1a4..e2c3c372 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -109,7 +109,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index 43b08f17..dddf67bd 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -83,7 +83,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index 5cea1c6b..c1b014e5 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -106,7 +106,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index f30caeab..f8725362 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -108,7 +108,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
-- 
cgit v1.2.3-70-g09d2


From ccdc0705c2d06122144755d21c6d2156f045304d Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 12:05:53 +0200
Subject: cosmetics

---
 site/assets/css/css.css | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'site')

diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index c3800315..129d6090 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -4,7 +4,8 @@ html, body {
   padding: 0;
   width: 100%;
   min-height: 100%;
-  font-family: 'Roboto Mono', sans-serif;
+  /*font-family: 'Roboto Mono', sans-serif;*/
+  font-family: 'Roboto', sans-serif;
   color: #eee;
   overflow-x: hidden;
 }
@@ -163,7 +164,7 @@ h1 {
   margin: 75px 0 10px;
   padding: 0;
   transition: color 0.1s cubic-bezier(0,0,1,1);
-  font-family: 'Roboto';
+  font-family: 'Roboto Mono', monospace;
 }
 h2 {
   color: #eee;
@@ -173,23 +174,23 @@ h2 {
   margin: 20px 0 10px;
   padding: 0;
   transition: color 0.1s cubic-bezier(0,0,1,1);
-  font-family: 'Roboto';
+  font-family: 'Roboto Mono', monospace;
 }
 h3 {
   margin: 0 0 20px 0;
   padding: 20px 0 0 0;
   font-size: 22pt;
-  font-weight: 500;
+  font-weight: 400;
   transition: color 0.1s cubic-bezier(0,0,1,1);
-  font-family: 'Roboto';
+  font-family: 'Roboto Mono', monospace;
 }
 h4 {
   margin: 0 0 10px 0;
   padding: 0;
   font-size: 11pt;
-  font-weight: 500;
+  font-weight: 400;
   transition: color 0.1s cubic-bezier(0,0,1,1);
-  font-family: 'Roboto';
+  font-family: 'Roboto Mono', monospace;
 }
 .content h3 a {
   color: #888;
@@ -212,11 +213,11 @@ h4 {
   border-bottom: 0;
 }
 th, .gray {
-  font-family: 'Roboto Mono', monospace;
+  font-family: 'Roboto', monospace;
   font-weight: 500;
   text-transform: uppercase;
   letter-spacing: .15rem;
-  color: #999;
+  color: #777;
 }
 th, .gray {
   font-size: 9pt;
@@ -248,7 +249,7 @@ section {
 p {
   margin: 0 10px 20px 0;
   line-height: 2;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: 300;
 }
 p.subp{
@@ -272,18 +273,19 @@ p.subp{
   flex-direction: row;
   justify-content: flex-start;
   align-items: flex-start;
-  font-size: 14px;
+  font-size: 12px;
+  color: #ccc;
   margin-bottom: 20px;
   font-family: 'Roboto', sans-serif;
 }
 .meta > div {
   margin-right: 20px;
-  line-height: 19px
+  line-height: 17px
   /*font-size:11px;*/
 }
 .meta .gray {
   font-size: 9pt;
-  padding-bottom: 4px;
+  padding-bottom: 5px;
   line-height: 14px
 }
 .right-sidebar {
@@ -303,7 +305,7 @@ p.subp{
   padding-top: 10px;
   padding-right: 20px;
   /*margin-right: 20px;*/
-  margin-bottom: 30px;
+  margin-bottom: 10px;
   /*border-right: 1px solid #444;*/
   font-family: 'Roboto';
   font-size: 14px;
-- 
cgit v1.2.3-70-g09d2


From 1369a597f2f564bf305e0918f91e2a96a4fded82 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 12:06:14 +0200
Subject: brainwash, example sidebar

---
 .../datasets/brainwash/assets/00818000_640x480.jpg | Bin 33112 -> 0 bytes
 .../datasets/brainwash/assets/background_540.jpg   | Bin 83594 -> 0 bytes
 .../datasets/brainwash/assets/background_600.jpg   | Bin 86425 -> 0 bytes
 .../brainwash/assets/brainwash_mean_overlay.jpg    | Bin 0 -> 150399 bytes
 .../brainwash/assets/brainwash_mean_overlay_wm.jpg | Bin 0 -> 151713 bytes
 site/content/pages/datasets/brainwash/index.md     |  41 ++++++++++++++++-----
 6 files changed, 31 insertions(+), 10 deletions(-)
 delete mode 100644 site/content/pages/datasets/brainwash/assets/00818000_640x480.jpg
 delete mode 100644 site/content/pages/datasets/brainwash/assets/background_540.jpg
 delete mode 100755 site/content/pages/datasets/brainwash/assets/background_600.jpg
 create mode 100755 site/content/pages/datasets/brainwash/assets/brainwash_mean_overlay.jpg
 create mode 100755 site/content/pages/datasets/brainwash/assets/brainwash_mean_overlay_wm.jpg

(limited to 'site')

diff --git a/site/content/pages/datasets/brainwash/assets/00818000_640x480.jpg b/site/content/pages/datasets/brainwash/assets/00818000_640x480.jpg
deleted file mode 100644
index 30c0fcb1..00000000
Binary files a/site/content/pages/datasets/brainwash/assets/00818000_640x480.jpg and /dev/null differ
diff --git a/site/content/pages/datasets/brainwash/assets/background_540.jpg b/site/content/pages/datasets/brainwash/assets/background_540.jpg
deleted file mode 100644
index 5c8c0ad4..00000000
Binary files a/site/content/pages/datasets/brainwash/assets/background_540.jpg and /dev/null differ
diff --git a/site/content/pages/datasets/brainwash/assets/background_600.jpg b/site/content/pages/datasets/brainwash/assets/background_600.jpg
deleted file mode 100755
index 8f2de697..00000000
Binary files a/site/content/pages/datasets/brainwash/assets/background_600.jpg and /dev/null differ
diff --git a/site/content/pages/datasets/brainwash/assets/brainwash_mean_overlay.jpg b/site/content/pages/datasets/brainwash/assets/brainwash_mean_overlay.jpg
new file mode 100755
index 00000000..2f5917e3
Binary files /dev/null and b/site/content/pages/datasets/brainwash/assets/brainwash_mean_overlay.jpg differ
diff --git a/site/content/pages/datasets/brainwash/assets/brainwash_mean_overlay_wm.jpg b/site/content/pages/datasets/brainwash/assets/brainwash_mean_overlay_wm.jpg
new file mode 100755
index 00000000..790dbb79
Binary files /dev/null and b/site/content/pages/datasets/brainwash/assets/brainwash_mean_overlay_wm.jpg differ
diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md
index 0bf67455..d9bffb39 100644
--- a/site/content/pages/datasets/brainwash/index.md
+++ b/site/content/pages/datasets/brainwash/index.md
@@ -19,28 +19,24 @@ authors: Adam Harvey
 + Published: 2015
 + Images: 11,918
 + Faces: 91,146
-+ Created by: Stanford Department of Computer Science
++ Created by: Stanford University (US)<br>Max Planck Institute for Informatics (DE)
 + Funded by: Max Planck Center for Visual Computing and Communication
-+ Location: Brainwash Cafe, San Franscisco
-+ Purpose: Training face detection
++ Purpose: Face detection
 + Website: <a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">stanford.edu</a>
-+ Paper: <a href="http://arxiv.org/abs/1506.04878">End-to-End People Detection in Crowded Scenes</a>
-+ Explicit Consent: No
 
 
 ## Brainwash Dataset
 
 (PAGE UNDER DEVELOPMENT)
 
-*Brainwash* is a face detection dataset created from the Brainwash Cafe's livecam footage including 11,918 images of "everyday life of a busy downtown cafe[^readme]". The images are used to develop face detection algorithms for the "challenging task of detecting people in crowded scenes" and tracking them.
+*Brainwash* is a head detection dataset created from San Francisco's Brainwash Cafe livecam footage. It includes 11,918 images of "everyday life of a busy downtown cafe[^readme]". The images are used to train and validate algorithms for detecting people in crowded scenes.
 
-Before closing in 2017, Brainwash Cafe was a "cafe and laundromat" located in San Francisco's SoMA district. The cafe published a publicy available livestream from the cafe with a view of the cash register, performance stage, and seating area.
+Before closing in 2017, The Brainwash Cafe was a combination cafe, laundromat, and performance venue located in San Francisco's SoMA district. The images used for Brainwash dataset were captured on 3 days: October 27, November 13, and November 24 in 2014. According the author's reserach paper introducing the dataset, the images were acquired with the help of Angelcam.com [cite orig paper].
 
-Since it's publication by Stanford in 2015, the Brainwash dataset has appeared in several notable research papers. In September 2016 four researchers from the National University of Defense Technology in Changsha, China used the Brainwash dataset for a research study on "people head detection in crowded scenes", concluding that their algorithm "achieves superior head detection performance on the crowded scenes dataset[^localized_region_context]". And again in 2017 three researchers at the National University of Defense Technology used Brainwash for a study on object detection noting "the data set used in our experiment is shown in Table 1, which includes one scene of the brainwash dataset[^replacement_algorithm]".
+Brainwash is not a widely used dataset but since it's publication by Stanford in 2015, it has notably appeared in several research papers from the National University of Defense Technology in Changsha, China. In 2016 and in 2017 researchers there conducted studies on "people head detection in crowded scenes" [^localized_region_context] [^replacement_algorithm].
 
-![caption: An sample image from the Brainwash dataset used for training face and head detection algorithms for surveillance. The datset contains about 12,000 images. License: Open Data Commons Public Domain Dedication (PDDL)](assets/00425000_960.jpg)
+![caption: The pixel-averaged image of all Brainwash dataset images is shown with 81,973 head annotations drawn from the Brainwash training partition. (c) Adam Harvey](assets/brainwash_mean_overlay.jpg)
 
-![caption: 49 of the 11,918 images included in the Brainwash dataset. License: Open Data Commons Public Domain Dedication (PDDL)](assets/brainwash_montage.jpg)
 
 {% include 'chart.html' %}
 
@@ -55,12 +51,37 @@ Add more analysis here
 
 {% include 'citations.html' %}
 
+![caption: An sample image from the Brainwash dataset used for training face and head detection algorithms for surveillance. The datset contains about 12,000 images. License: Open Data Commons Public Domain Dedication (PDDL)](assets/00425000_960.jpg)
+
+![caption: 49 of the 11,918 images included in the Brainwash dataset. License: Open Data Commons Public Domain Dedication (PDDL)](assets/brainwash_montage.jpg)
 
 ### Additional Information
 
 - The dataset author spoke about his research at the CVPR conference in 2016 <https://www.youtube.com/watch?v=Nl2fBKxwusQ>
 
 
+To evaluate the performance of our approach, we collected a
+large dataset of images from busy scenes using video footage available from public webcams. In
+total, we collect 11917 images with 91146 labeled people. We extract images from video footage at
+a fixed interval of 100 seconds to ensure a large variation in images. We allocate 1000 images for
+testing and validation, and leave the remaining images for training, making sure that no temporal
+overlaps exist between training and test splits. The resulting training set contains 82906 instances.
+Test and validation sets contain 4922 and 3318 people instances respectively. Images were labeled
+using Amazon Mechanical Turk by a handful of workers pre-selected through their performance on
+an example task. We label each person’s head to avoid ambiguity in bounding box locations. The
+annotator labels any person she is able to recognize, even if a substantial part of the person is not
+visible. Images and annotations will be made available 1 .
+Examples of collected images are shown in Fig. 6, and in the video included in the supplemental
+material. Images in our dataset include challenges such as people at small scales, strong partial
+occlusions, and a large variability in clothing and appearance.
+
+TODO
+
+- add bounding boxes to the header image
+- remake montage with randomized images, with bboxes
+- clean up intro text
+
+
 ### Footnotes
 
 [^readme]: "readme.txt" https://exhibits.stanford.edu/data/catalog/sx925dc9385.
-- 
cgit v1.2.3-70-g09d2


From 1d261333895cb9305c73d02170e61c5100a39358 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 12:49:57 +0200
Subject: add dataset size

---
 site/content/pages/datasets/brainwash/index.md | 38 +++++++-------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

(limited to 'site')

diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md
index d9bffb39..6d90e78f 100644
--- a/site/content/pages/datasets/brainwash/index.md
+++ b/site/content/pages/datasets/brainwash/index.md
@@ -2,8 +2,8 @@
 
 status: published
 title: Brainwash
-desc: Brainwash is a dataset of webcam images taken from the Brainwash Cafe in San Francisco
-subdesc: The Brainwash dataset includes 11,918 images of "everyday life of a busy downtown cafe" and is used for training head detection algorithms
+desc: Brainwash is a dataset of webcam images taken from the Brainwash Cafe in San Francisco in 2014
+subdesc: The Brainwash dataset includes 11,918 images of "everyday life of a busy downtown cafe" and is used for training head detection surveillance algorithms
 slug: brainwash
 cssclass: dataset
 image: assets/background.jpg
@@ -21,19 +21,18 @@ authors: Adam Harvey
 + Faces: 91,146
 + Created by: Stanford University (US)<br>Max Planck Institute for Informatics (DE)
 + Funded by: Max Planck Center for Visual Computing and Communication
-+ Purpose: Face detection
++ Purpose: Head detection
++ Download Size: 4.1GB
 + Website: <a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">stanford.edu</a>
 
 
 ## Brainwash Dataset
 
-(PAGE UNDER DEVELOPMENT)
+*Brainwash* is a head detection dataset created from San Francisco's Brainwash Cafe livecam footage. It includes 11,918 images of "everyday life of a busy downtown cafe"[^readme] captured at 100 second intervals throught the entire day. Brainwash dataset was captured during 3 days in 2014: October 27, November 13, and November 24. According the author's reserach paper introducing the dataset, the images were acquired with the help of Angelcam.com [cite orig paper].
 
-*Brainwash* is a head detection dataset created from San Francisco's Brainwash Cafe livecam footage. It includes 11,918 images of "everyday life of a busy downtown cafe[^readme]". The images are used to train and validate algorithms for detecting people in crowded scenes.
+Brainwash is not a widely used dataset but since its publication by Stanford University in 2015, it has notably appeared in several research papers from the National University of Defense Technology in Changsha, China. In 2016 and in 2017 researchers there conducted studies on detecting people's heads in crowded scenes for the purpose of surveillance [^localized_region_context] [^replacement_algorithm].
 
-Before closing in 2017, The Brainwash Cafe was a combination cafe, laundromat, and performance venue located in San Francisco's SoMA district. The images used for Brainwash dataset were captured on 3 days: October 27, November 13, and November 24 in 2014. According the author's reserach paper introducing the dataset, the images were acquired with the help of Angelcam.com [cite orig paper].
-
-Brainwash is not a widely used dataset but since it's publication by Stanford in 2015, it has notably appeared in several research papers from the National University of Defense Technology in Changsha, China. In 2016 and in 2017 researchers there conducted studies on "people head detection in crowded scenes" [^localized_region_context] [^replacement_algorithm].
+If you happen to have been at Brainwash cafe in San Franscisco at any time on October 26, November 13, or November 24 in 2014 you are most likely included in the Brainwash dataset.
 
 ![caption: The pixel-averaged image of all Brainwash dataset images is shown with 81,973 head annotations drawn from the Brainwash training partition. (c) Adam Harvey](assets/brainwash_mean_overlay.jpg)
 
@@ -44,42 +43,25 @@ Brainwash is not a widely used dataset but since it's publication by Stanford in
 
 {% include 'map.html' %}
 
-Add more analysis here
-
+{% include 'citations.html' %}
 
 {% include 'supplementary_header.html' %}
 
-{% include 'citations.html' %}
-
 ![caption: An sample image from the Brainwash dataset used for training face and head detection algorithms for surveillance. The datset contains about 12,000 images. License: Open Data Commons Public Domain Dedication (PDDL)](assets/00425000_960.jpg)
 
 ![caption: 49 of the 11,918 images included in the Brainwash dataset. License: Open Data Commons Public Domain Dedication (PDDL)](assets/brainwash_montage.jpg)
 
-### Additional Information
+#### Additional Resources
 
 - The dataset author spoke about his research at the CVPR conference in 2016 <https://www.youtube.com/watch?v=Nl2fBKxwusQ>
 
 
-To evaluate the performance of our approach, we collected a
-large dataset of images from busy scenes using video footage available from public webcams. In
-total, we collect 11917 images with 91146 labeled people. We extract images from video footage at
-a fixed interval of 100 seconds to ensure a large variation in images. We allocate 1000 images for
-testing and validation, and leave the remaining images for training, making sure that no temporal
-overlaps exist between training and test splits. The resulting training set contains 82906 instances.
-Test and validation sets contain 4922 and 3318 people instances respectively. Images were labeled
-using Amazon Mechanical Turk by a handful of workers pre-selected through their performance on
-an example task. We label each person’s head to avoid ambiguity in bounding box locations. The
-annotator labels any person she is able to recognize, even if a substantial part of the person is not
-visible. Images and annotations will be made available 1 .
-Examples of collected images are shown in Fig. 6, and in the video included in the supplemental
-material. Images in our dataset include challenges such as people at small scales, strong partial
-occlusions, and a large variability in clothing and appearance.
-
 TODO
 
 - add bounding boxes to the header image
 - remake montage with randomized images, with bboxes
 - clean up intro text
+- verify quote citations
 
 
 ### Footnotes
-- 
cgit v1.2.3-70-g09d2


From e61935270fe6bf34658865800c203334047be4a7 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 12:51:34 +0200
Subject: cosmetics

---
 site/assets/css/applets.css | 1 +
 site/assets/css/css.css     | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'site')

diff --git a/site/assets/css/applets.css b/site/assets/css/applets.css
index 41d04783..7fac3e27 100644
--- a/site/assets/css/applets.css
+++ b/site/assets/css/applets.css
@@ -3,6 +3,7 @@
 .applet_container {
   min-height: 340px;
   clear: left;
+  margin: 20px auto 40px auto;
 }
 .applet_container.autosize {
   min-height: 0;
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 129d6090..cd16409a 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -169,9 +169,9 @@ h1 {
 h2 {
   color: #eee;
   font-weight: 400;
-  font-size: 32pt;
-  line-height: 43pt;
-  margin: 20px 0 10px;
+  font-size: 32px;
+  line-height: 43px;
+  margin: 20px 0 20px;
   padding: 0;
   transition: color 0.1s cubic-bezier(0,0,1,1);
   font-family: 'Roboto Mono', monospace;
@@ -251,6 +251,7 @@ p {
   line-height: 2;
   font-size: 18px;
   font-weight: 300;
+  color: #dedede;
 }
 p.subp{
   font-size: 14px;
-- 
cgit v1.2.3-70-g09d2


From 7aaa8b8cd68d3eb09c68da2b0a64cbe635fdb8d5 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 12:51:52 +0200
Subject: updating datasets

---
 .../assets/duke_mtmc_cam5_average_comp.jpg         | Bin 0 -> 195172 bytes
 site/content/pages/datasets/duke_mtmc/index.md     |  28 ++++++++++++------
 .../datasets/uccs/assets/uccs_bboxes_clr_fill.jpg  | Bin 146050 -> 0 bytes
 .../datasets/uccs/assets/uccs_bboxes_grayscale.jpg | Bin 299802 -> 0 bytes
 .../datasets/uccs/assets/uccs_mean_bboxes_comp.jpg | Bin 0 -> 253215 bytes
 site/content/pages/datasets/uccs/index.md          |  32 +++++++++++++++------
 6 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100755 site/content/pages/datasets/duke_mtmc/assets/duke_mtmc_cam5_average_comp.jpg
 delete mode 100644 site/content/pages/datasets/uccs/assets/uccs_bboxes_clr_fill.jpg
 delete mode 100644 site/content/pages/datasets/uccs/assets/uccs_bboxes_grayscale.jpg
 create mode 100644 site/content/pages/datasets/uccs/assets/uccs_mean_bboxes_comp.jpg

(limited to 'site')

diff --git a/site/content/pages/datasets/duke_mtmc/assets/duke_mtmc_cam5_average_comp.jpg b/site/content/pages/datasets/duke_mtmc/assets/duke_mtmc_cam5_average_comp.jpg
new file mode 100755
index 00000000..3cd64df1
Binary files /dev/null and b/site/content/pages/datasets/duke_mtmc/assets/duke_mtmc_cam5_average_comp.jpg differ
diff --git a/site/content/pages/datasets/duke_mtmc/index.md b/site/content/pages/datasets/duke_mtmc/index.md
index de1fa14c..c626ef4e 100644
--- a/site/content/pages/datasets/duke_mtmc/index.md
+++ b/site/content/pages/datasets/duke_mtmc/index.md
@@ -2,8 +2,8 @@
 
 status: published
 title: Duke Multi-Target, Multi-Camera Tracking
-desc: <span class="dataset-name">Duke MTMC</span> is a dataset of CCTV footage of students at Duke University
-subdesc: Duke MTMC contains over 2 million video frames and 2,000 unique identities collected from 8 cameras at Duke University campus in March 2014
+desc: <span class="dataset-name">Duke MTMC</span> is a dataset of surveillance camera footage of students on Duke University campus
+subdesc: Duke MTMC contains over 2 million video frames and 2,000 unique identities collected from 8 HD cameras at Duke University campus in March 2014
 slug: duke_mtmc
 cssclass: dataset
 image: assets/background.jpg
@@ -15,17 +15,27 @@ authors: Adam Harvey
 
 ### sidebar
 
-+ Collected: March 19, 2014
-+ Cameras: 8
-+ Video Frames: 2,000,000
-+ Identities: Over 2,000
-+ Used for: Person re-identification, <br>face recognition
-+ Sector: Academic
++ Created: 2014
++ Identities: Over 2,700
++ Used for: Face recognition, person re-identification
++ Created by: Computer Science Department, Duke University, Durham, US
 + Website: <a href="http://vision.cs.duke.edu/DukeMTMC/">duke.edu</a>
 
 ## Duke Multi-Target, Multi-Camera Tracking Dataset (Duke MTMC)
 
-(PAGE UNDER DEVELOPMENT)
+[ PAGE UNDER DEVELOPMENT ]
+
+Duke MTMC is a dataset of video recorded on Duke University campus during for the purpose of training, evaluating, and improving *multi-target multi-camera tracking*. The videos were recorded during February and March 2014 and cinclude
+
+Includes a total of 888.8 minutes of video (ind. verified)
+
+"We make available a new data set that has more than 2 million frames and more than 2,700 identities. It consists of 8×85 minutes of 1080p video recorded at 60 frames per second from 8 static cameras deployed on the Duke University campus during periods between lectures, when pedestrian traffic is heavy."
+
+The dataset includes approximately 2,000 annotated identities appearing in 85 hours of video from 8 cameras located throughout Duke University's campus.
+
+![caption: Duke MTMC pixel-averaged image of camera #5 is shown with the bounding boxes for each student drawn in white. (c) Adam Harvey](assets/duke_mtmc_cam5_average_comp.jpg)
+
+According to the dataset authors, 
 
 {% include 'map.html' %}
 
diff --git a/site/content/pages/datasets/uccs/assets/uccs_bboxes_clr_fill.jpg b/site/content/pages/datasets/uccs/assets/uccs_bboxes_clr_fill.jpg
deleted file mode 100644
index c8002bb9..00000000
Binary files a/site/content/pages/datasets/uccs/assets/uccs_bboxes_clr_fill.jpg and /dev/null differ
diff --git a/site/content/pages/datasets/uccs/assets/uccs_bboxes_grayscale.jpg b/site/content/pages/datasets/uccs/assets/uccs_bboxes_grayscale.jpg
deleted file mode 100644
index 6e2833dd..00000000
Binary files a/site/content/pages/datasets/uccs/assets/uccs_bboxes_grayscale.jpg and /dev/null differ
diff --git a/site/content/pages/datasets/uccs/assets/uccs_mean_bboxes_comp.jpg b/site/content/pages/datasets/uccs/assets/uccs_mean_bboxes_comp.jpg
new file mode 100644
index 00000000..18f4c5ec
Binary files /dev/null and b/site/content/pages/datasets/uccs/assets/uccs_mean_bboxes_comp.jpg differ
diff --git a/site/content/pages/datasets/uccs/index.md b/site/content/pages/datasets/uccs/index.md
index 092638c0..b3d16c2e 100644
--- a/site/content/pages/datasets/uccs/index.md
+++ b/site/content/pages/datasets/uccs/index.md
@@ -2,8 +2,8 @@
 
 status: published
 title: Unconstrained College Students
-desc: <span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of images ...
-subdesc: The UCCS dataset includes ...
+desc: <span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of long-range surveillance photos of students taken without their knowledge
+subdesc: The UCCS dataset includes 16,149 images and 1,732 identities, is used for face recognition and face detection, and funded was several US defense agences
 slug: uccs
 cssclass: dataset
 image: assets/background.jpg
@@ -15,16 +15,22 @@ authors: Adam Harvey
 
 ### sidebar
 
-+ Collected: TBD
-+ Published: TBD
-+ Images: TBD
-+ Faces: TBD
++ Published: 2018
++ Images: 16,149
++ Identities: 1,732
++ Used for: Face recognition, face detection
++ Created by: Unviversity of Colorado Colorado Springs (US)
++ Funded by: ODNI, IARPA, ONR MURI, Amry SBIR, SOCOM SBIR
++ Website: <a href="https://vast.uccs.edu/Opensetface/">vast.uccs.edu</a>
 
 
 ## Unconstrained College Students ...
 
 (PAGE UNDER DEVELOPMENT)
 
+![caption: The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey](assets/uccs_mean_bboxes_comp.jpg)
+
+
 {% include 'map.html' %}
 
 {% include 'chart.html' %}
@@ -36,7 +42,6 @@ authors: Adam Harvey
 {% include 'citations.html' %}
 
 
-![Bounding box visualization](assets/uccs_bboxes_grayscale.jpg)
 
 ### Research Notes
 
@@ -55,4 +60,15 @@ The more recent UCCS version of the dataset received funding from [^funding_uccs
 
 
 [^funding_sb]: Sapkota, Archana and Boult, Terrance. "Large Scale Unconstrained Open Set Face Database." 2013.
-[^funding_uccs]: Günther, M. et. al. "Unconstrained Face Detection and Open-Set Face Recognition Challenge," 2018. Arxiv 1708.02337v3.
\ No newline at end of file
+[^funding_uccs]: Günther, M. et. al. "Unconstrained Face Detection and Open-Set Face Recognition Challenge," 2018. Arxiv 1708.02337v3.
+
+
+" In most face detection/recognition datasets, the majority of images are “posed”, i.e. the subjects know they are being photographed, and/or the images are selected for publication in public media. Hence, blurry, occluded and badly illuminated images are generally uncommon in these datasets. In addition, most of these challenges are close-set, i.e. the list of subjects in the gallery is the same as the one used for testing.
+
+This challenge explores more unconstrained data, by introducing the new UnConstrained College Students (UCCS) dataset, where subjects are photographed using a long-range high-resolution surveillance camera without their knowledge. Faces inside these images are of various poses, and varied levels of blurriness and occlusion. The challenge also creates an open set recognition problem, where unknown people will be seen during testing and must be rejected.
+
+With this challenge, we hope to foster face detection and recognition research towards surveillance applications that are becoming more popular and more required nowadays, and where no automatic recognition algorithm has proven to be useful yet.
+
+UnConstrained College Students (UCCS) Dataset
+
+The UCCS dataset was collected over several months using Canon 7D camera fitted with Sigma 800mm F5.6 EX APO DG HSM lens, taking images at one frame per second, during times when many students were walking on the sidewalk. "
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From c9c353296dff4b4f0afa770e106d67eb8fe80c70 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 12:52:06 +0200
Subject: txt tweaks

---
 site/includes/chart.html                | 3 +--
 site/includes/citations.html            | 4 ++--
 site/includes/map.html                  | 9 +++++----
 site/includes/supplementary_header.html | 3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'site')

diff --git a/site/includes/chart.html b/site/includes/chart.html
index 45c13493..01c2e83b 100644
--- a/site/includes/chart.html
+++ b/site/includes/chart.html
@@ -2,8 +2,7 @@
   <h3>Who used {{ metadata.meta.dataset.name_display }}?</h3>
 
   <p>
-    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
-    to see yearly totals.  These charts show at most the top 10 countries.
+    This bar chart presents a ranking of the top countries where dataset citations originated.  Mouse over individual columns to see yearly totals. These charts show at most the top 10 countries.
   </p>
  
  </section>
diff --git a/site/includes/citations.html b/site/includes/citations.html
index f15c5148..74ac5cdc 100644
--- a/site/includes/citations.html
+++ b/site/includes/citations.html
@@ -1,8 +1,8 @@
 <section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website that aggregates and indexes research papers. Each citation has been geocoded using names of institutions found in the PDF front matter, or as listed on other resources then manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
diff --git a/site/includes/map.html b/site/includes/map.html
index 867ada4c..31d577cd 100644
--- a/site/includes/map.html
+++ b/site/includes/map.html
@@ -1,6 +1,6 @@
 <section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -12,14 +12,14 @@
 	</div>
 	 -->
 	<p>
-		To understand how {{ metadata.meta.dataset.name_display }} has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citations {{ metadata.meta.dataset.name_display }} are collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
 <section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
@@ -31,8 +31,9 @@
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] {{ metadata.meta.dataset.name_display }} ... Standardized paragraph of text about the map. 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.
 	</p>
 </section>
+ -->
\ No newline at end of file
diff --git a/site/includes/supplementary_header.html b/site/includes/supplementary_header.html
index 5fd4b2b4..bcd84223 100644
--- a/site/includes/supplementary_header.html
+++ b/site/includes/supplementary_header.html
@@ -6,5 +6,6 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section>
-- 
cgit v1.2.3-70-g09d2


From 4a11e59f991c8ca12ef4ca20a3b01741f311a0e4 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 13:10:52 +0200
Subject: updates, broke smth

---
 site/assets/css/css.css                            |  4 +-
 site/content/pages/datasets/index.md               |  2 +-
 site/content/pages/datasets/uccs/index.md          |  3 +-
 .../research/01_from_1_to_100_pixels/index.md      | 52 ++++++++++++++++++++++
 .../research/02_what_computers_can_see/index.md    | 25 ++++++++++-
 site/includes/map.html                             |  2 +-
 6 files changed, 81 insertions(+), 7 deletions(-)

(limited to 'site')

diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index cd16409a..0ee8a4f3 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -884,7 +884,7 @@ ul.map-legend li.source:before {
   font-family: Roboto, sans-serif;
   font-weight: 400;
   background: #202020;
-  padding: 15px;
+  padding: 20px;
   margin: 10px;
 }
 .columns .column:first-of-type {
@@ -937,7 +937,7 @@ ul.map-legend li.source:before {
   margin:0 0 0 40px;
 }
 .content-about .team-member p{
-  font-size:14px;
+  font-size:16px;
 }
 .content-about .team-member img{
   margin:0;
diff --git a/site/content/pages/datasets/index.md b/site/content/pages/datasets/index.md
index 2e943fbe..c0373d60 100644
--- a/site/content/pages/datasets/index.md
+++ b/site/content/pages/datasets/index.md
@@ -13,4 +13,4 @@ sync: false
 
 # Facial Recognition Datasets
 
-### Survey
+Explore publicly available facial recognition datasets. More datasets will be added throughout 2019.
diff --git a/site/content/pages/datasets/uccs/index.md b/site/content/pages/datasets/uccs/index.md
index b3d16c2e..e0925e07 100644
--- a/site/content/pages/datasets/uccs/index.md
+++ b/site/content/pages/datasets/uccs/index.md
@@ -3,8 +3,7 @@
 status: published
 title: Unconstrained College Students
 desc: <span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of long-range surveillance photos of students taken without their knowledge
-subdesc: The UCCS dataset includes 16,149 images and 1,732 identities, is used for face recognition and face detection, and funded was several US defense agences
-slug: uccs
+subdesc: The UCCS dataset includes 16,149 images and 1,732 identities of students at University of Colorado Colorado Springs campus and is used for face recognition and face detection
 cssclass: dataset
 image: assets/background.jpg
 published: 2019-2-23
diff --git a/site/content/pages/research/01_from_1_to_100_pixels/index.md b/site/content/pages/research/01_from_1_to_100_pixels/index.md
index a7b863a9..b219dffb 100644
--- a/site/content/pages/research/01_from_1_to_100_pixels/index.md
+++ b/site/content/pages/research/01_from_1_to_100_pixels/index.md
@@ -56,3 +56,55 @@ Ideas:
 
 - "Note that we only keep the images with a minimal side length of 80 pixels." and "a face will be labeled as “Ignore” if it is very difficult to be detected due to blurring, severe deformation and unrecognizable eyes, or the side length of its bounding box is less than 32 pixels." Ge_Detecting_Masked_Faces_CVPR_2017_paper.pdf 
 - IBM DiF: "Faces with region size less than 50x50 or inter-ocular distance of less than 30 pixels were discarded. Faces with non-frontal pose, or anything beyond being slightly tilted to the left or the right, were also discarded."
+
+
+
+
+As the resolution
+formatted as rectangular databases of 16 bit RGB-tuples or 8 bit grayscale values 
+
+
+To consider how visual privacy applies to real world surveillance situations, the first 
+
+A single 8-bit grayscale pixel with 256 values is enough to represent the entire alphabet `a-Z0-9` with room to spare. 
+
+A 2x2 pixels contains
+
+Using no more than a 42 pixel (6x7 image) face image researchers [cite] were able to correctly distinguish between a group of 50 people. Yet 
+
+The likely outcome of face recognition research is that more data is needed to improve. Indeed, resolution is the determining factor for all biometric systems, both as training data to increase 
+
+Pixels, typically considered the buiding blocks of images and vidoes, can also be plotted as a graph of sensor values corresponding to the intensity of RGB-calibrated sensors.
+
+
+Wi-Fi and cameras presents elevated risks for transmitting videos and image documentation from conflict zones, high-risk situations, or even sharing on social media. How can new developments in computer vision also be used in reverse, as a counter-forensic tool, to minimize an individual's privacy risk?
+
+As the global Internet becomes increasingly effecient at turning the Internet into a giant dataset for machine learning, forensics, and data analysing, it would be prudent to also consider tools for decreasing the resolution. The Visual Defense module is just that. What are new ways to minimize the adverse effects of surveillance by dulling the blade. For example, a researcher paper showed that by decreasing a face size to 12x16 it was possible to do 98% accuracy with 50 people. This is clearly an example of 
+
+This research module, tentatively called Visual Defense Tools, aims to explore the 
+
+
+### Prior Research
+
+- MPI visual privacy advisor
+- NIST: super resolution
+- YouTube blur tool
+- WITNESS: blur tool
+- Pixellated text 
+- CV Dazzle
+- Bellingcat guide to geolocation
+- Peng! magic passport
+
+### Notes
+
+- In China, out of the approximately 200 million surveillance cameras only about 15% have enough resolution for face recognition. 
+- In Apple's FaceID security guide, the probability of someone else's face unlocking your phone is 1 out of 1,000,000. 
+- In England, the Metropolitan Police reported a false-positive match rate of 98% when attempting to use face recognition to locate wanted criminals. 
+- In a face recognition trial at Berlin's Sudkreuz station, the false-match rate was 20%. 
+
+
+What all 3 examples illustrate is that face recognition is anything but absolute. In a 2017 talk, Jason Matheny the former directory of IARPA, admitted the face recognition is so brittle it can be subverted by using a magic marker and drawing "a few dots on your forehead". In fact face recognition is a misleading term. Face recognition is search engine for faces that can only ever show you the mos likely match. This presents real a real threat to privacy and lends 
+
+
+Globally, iPhone users unwittingly agree to 1/1,000,000 probably 
+relying on FaceID and TouchID to protect their information agree to a 
\ No newline at end of file
diff --git a/site/content/pages/research/02_what_computers_can_see/index.md b/site/content/pages/research/02_what_computers_can_see/index.md
index ab4c7884..51621f46 100644
--- a/site/content/pages/research/02_what_computers_can_see/index.md
+++ b/site/content/pages/research/02_what_computers_can_see/index.md
@@ -100,6 +100,7 @@ A list of 100 things computer vision can see, eg:
 - Wearing Necktie
 - Wearing Necklace
 
+for i in {1..9};do wget http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_0$i.MP4;done;for i in {10..20}; do wget http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_$i.MP4;done
 
 ## From Market 1501
 
@@ -149,4 +150,26 @@ Visibility boolean for each keypoint
 Region annotations (upper clothes, lower clothes, dress, socks, shoes, hands, gloves, neck, face, hair, hat, sunglasses, bag, occluder)
 Body type (male, female or child)
 
-source: https://www2.eecs.berkeley.edu/Research/Projects/CS/vision/shape/h3d/
\ No newline at end of file
+source: https://www2.eecs.berkeley.edu/Research/Projects/CS/vision/shape/h3d/
+
+## From Leeds Sports Pose
+
+=INDEX(A2:A9,MATCH(datasets!D1,B2:B9,0))
+=VLOOKUP(A2, datasets!A:J, 7, FALSE)
+
+Right ankle
+Right knee
+Right hip
+Left hip
+Left knee
+Left ankle
+Right wrist
+Right elbow
+Right shoulder
+Left shoulder
+Left elbow
+Left wrist
+Neck
+Head top
+
+source: http://web.archive.org/web/20170915023005/sam.johnson.io/research/lsp.html
\ No newline at end of file
diff --git a/site/includes/map.html b/site/includes/map.html
index 31d577cd..30c248a6 100644
--- a/site/includes/map.html
+++ b/site/includes/map.html
@@ -12,7 +12,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citations {{ metadata.meta.dataset.name_display }} are collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citing {{ metadata.meta.dataset.name_full} is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
-- 
cgit v1.2.3-70-g09d2


From f98046ae89f42082ccbd3126533ba548d734aa78 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 13:21:27 +0200
Subject: copy

---
 client/table/file.table.js                             | 1 +
 site/includes/citations.html                           | 2 +-
 site/public/datasets/50_people_one_question/index.html | 2 +-
 site/public/datasets/brainwash/index.html              | 2 +-
 site/public/datasets/celeba/index.html                 | 2 +-
 site/public/datasets/cofw/index.html                   | 2 +-
 site/public/datasets/duke_mtmc/index.html              | 2 +-
 site/public/datasets/hrt_transgender/index.html        | 2 +-
 site/public/datasets/lfw/index.html                    | 2 +-
 site/public/datasets/market_1501/index.html            | 2 +-
 site/public/datasets/msceleb/index.html                | 2 +-
 site/public/datasets/pipa/index.html                   | 2 +-
 site/public/datasets/uccs/index.html                   | 2 +-
 site/public/datasets/viper/index.html                  | 2 +-
 14 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'site')

diff --git a/client/table/file.table.js b/client/table/file.table.js
index a7e25bbf..92f5cf72 100644
--- a/client/table/file.table.js
+++ b/client/table/file.table.js
@@ -13,6 +13,7 @@ class FileTable extends Component {
   }
   
   componentDidMount() {
+    console.log(payload.url)
     fetch(payload.url, { mode: 'cors' })
       .then(r => r.text())
       .then(text => {
diff --git a/site/includes/citations.html b/site/includes/citations.html
index d29812df..ebd37d61 100644
--- a/site/includes/citations.html
+++ b/site/includes/citations.html
@@ -3,7 +3,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index 0a9e8297..988ce2dc 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -82,7 +82,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index 46cefbe7..20f2f096 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -107,7 +107,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index ca04062d..07522561 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -82,7 +82,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 02d08278..99d4a9ef 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -92,7 +92,7 @@ To increase the number of training images, and since  COFW has the exact same la
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index 27a17c94..431cf7ff 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -103,7 +103,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index 63647f9a..7e10c2fb 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -102,7 +102,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index 532abc56..9cbf2e11 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -118,7 +118,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index c2569b81..b7e68c47 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -80,7 +80,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index e2c3c372..50788aad 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -106,7 +106,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index dddf67bd..09baca99 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -80,7 +80,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index c1b014e5..ca106022 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -103,7 +103,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index f8725362..f78d1c04 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -105,7 +105,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
-- 
cgit v1.2.3-70-g09d2


From 2d8b7dd6ea6ccb0293c8839898cf7a1246dc0eb4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 14:25:06 +0200
Subject: rebuild

---
 megapixels/app/site/builder.py                     |  2 +-
 megapixels/app/site/loader.py                      |  3 ++
 site/content/pages/datasets/uccs/index.md          |  1 +
 site/includes/map.html                             |  2 +-
 site/public/datasets/index.html                    |  2 +-
 .../research/01_from_1_to_100_pixels/index.html    | 32 ++++++++++++++++++++++
 .../research/02_what_computers_can_see/index.html  | 19 +++++++++++++
 site/public/research/index.html                    | 18 ++++++++++--
 8 files changed, 74 insertions(+), 5 deletions(-)

(limited to 'site')

diff --git a/megapixels/app/site/builder.py b/megapixels/app/site/builder.py
index 603d4788..55a85b0f 100644
--- a/megapixels/app/site/builder.py
+++ b/megapixels/app/site/builder.py
@@ -57,7 +57,7 @@ def build_page(fn, research_posts, datasets):
     s3.sync_directory(dirname, s3_dir, metadata)
 
   content = parser.parse_markdown(metadata, sections, s3_path, skip_h1=skip_h1)
-
+  
   html = template.render(
     metadata=metadata,
     content=content,
diff --git a/megapixels/app/site/loader.py b/megapixels/app/site/loader.py
index a544333b..d150942c 100644
--- a/megapixels/app/site/loader.py
+++ b/megapixels/app/site/loader.py
@@ -85,6 +85,9 @@ def parse_metadata(fn, sections):
     metadata['meta'] = load_json(dataset_path)
     if not metadata['meta']:
       print("Bad metadata? {}".format(dataset_path))
+  else:
+    print(metadata['slug'])
+    print("{} does not exist!".format(dataset_path))
   if 'meta' not in metadata or not metadata['meta']: # dude
     metadata['meta'] = {}
 
diff --git a/site/content/pages/datasets/uccs/index.md b/site/content/pages/datasets/uccs/index.md
index e0925e07..1e3ec097 100644
--- a/site/content/pages/datasets/uccs/index.md
+++ b/site/content/pages/datasets/uccs/index.md
@@ -6,6 +6,7 @@ desc: <span class="dataset-name">Unconstrained College Students (UCCS)</span> is
 subdesc: The UCCS dataset includes 16,149 images and 1,732 identities of students at University of Colorado Colorado Springs campus and is used for face recognition and face detection
 cssclass: dataset
 image: assets/background.jpg
+slug: uccs
 published: 2019-2-23
 updated: 2019-2-23
 authors: Adam Harvey
diff --git a/site/includes/map.html b/site/includes/map.html
index 30c248a6..7511d4c7 100644
--- a/site/includes/map.html
+++ b/site/includes/map.html
@@ -12,7 +12,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citing {{ metadata.meta.dataset.name_full} is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citing {{ metadata.meta.dataset.name_full }} is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html
index 03b38f8a..1d2630e1 100644
--- a/site/public/datasets/index.html
+++ b/site/public/datasets/index.html
@@ -28,7 +28,7 @@
     
 
   <section><h1>Facial Recognition Datasets</h1>
-<h3>Survey</h3>
+<p>Explore publicly available facial recognition datasets. More datasets will be added throughout 2019.</p>
 </section>
 
   <section class='applet_container autosize'><div class='applet' data-payload='{"command":"dataset_list"}'></div></section>
diff --git a/site/public/research/01_from_1_to_100_pixels/index.html b/site/public/research/01_from_1_to_100_pixels/index.html
index c91d17ad..37fc367f 100644
--- a/site/public/research/01_from_1_to_100_pixels/index.html
+++ b/site/public/research/01_from_1_to_100_pixels/index.html
@@ -80,6 +80,38 @@
 <li>"Note that we only keep the images with a minimal side length of 80 pixels." and "a face will be labeled as “Ignore” if it is very difficult to be detected due to blurring, severe deformation and unrecognizable eyes, or the side length of its bounding box is less than 32 pixels." Ge_Detecting_Masked_Faces_CVPR_2017_paper.pdf </li>
 <li>IBM DiF: "Faces with region size less than 50x50 or inter-ocular distance of less than 30 pixels were discarded. Faces with non-frontal pose, or anything beyond being slightly tilted to the left or the right, were also discarded."</li>
 </ul>
+<p>As the resolution
+formatted as rectangular databases of 16 bit RGB-tuples or 8 bit grayscale values</p>
+<p>To consider how visual privacy applies to real world surveillance situations, the first</p>
+<p>A single 8-bit grayscale pixel with 256 values is enough to represent the entire alphabet <code>a-Z0-9</code> with room to spare.</p>
+<p>A 2x2 pixels contains</p>
+<p>Using no more than a 42 pixel (6x7 image) face image researchers [cite] were able to correctly distinguish between a group of 50 people. Yet</p>
+<p>The likely outcome of face recognition research is that more data is needed to improve. Indeed, resolution is the determining factor for all biometric systems, both as training data to increase</p>
+<p>Pixels, typically considered the buiding blocks of images and vidoes, can also be plotted as a graph of sensor values corresponding to the intensity of RGB-calibrated sensors.</p>
+<p>Wi-Fi and cameras presents elevated risks for transmitting videos and image documentation from conflict zones, high-risk situations, or even sharing on social media. How can new developments in computer vision also be used in reverse, as a counter-forensic tool, to minimize an individual's privacy risk?</p>
+<p>As the global Internet becomes increasingly effecient at turning the Internet into a giant dataset for machine learning, forensics, and data analysing, it would be prudent to also consider tools for decreasing the resolution. The Visual Defense module is just that. What are new ways to minimize the adverse effects of surveillance by dulling the blade. For example, a researcher paper showed that by decreasing a face size to 12x16 it was possible to do 98% accuracy with 50 people. This is clearly an example of</p>
+<p>This research module, tentatively called Visual Defense Tools, aims to explore the</p>
+<h3>Prior Research</h3>
+<ul>
+<li>MPI visual privacy advisor</li>
+<li>NIST: super resolution</li>
+<li>YouTube blur tool</li>
+<li>WITNESS: blur tool</li>
+<li>Pixellated text </li>
+<li>CV Dazzle</li>
+<li>Bellingcat guide to geolocation</li>
+<li>Peng! magic passport</li>
+</ul>
+<h3>Notes</h3>
+<ul>
+<li>In China, out of the approximately 200 million surveillance cameras only about 15% have enough resolution for face recognition. </li>
+<li>In Apple's FaceID security guide, the probability of someone else's face unlocking your phone is 1 out of 1,000,000. </li>
+<li>In England, the Metropolitan Police reported a false-positive match rate of 98% when attempting to use face recognition to locate wanted criminals. </li>
+<li>In a face recognition trial at Berlin's Sudkreuz station, the false-match rate was 20%. </li>
+</ul>
+<p>What all 3 examples illustrate is that face recognition is anything but absolute. In a 2017 talk, Jason Matheny the former directory of IARPA, admitted the face recognition is so brittle it can be subverted by using a magic marker and drawing "a few dots on your forehead". In fact face recognition is a misleading term. Face recognition is search engine for faces that can only ever show you the mos likely match. This presents real a real threat to privacy and lends</p>
+<p>Globally, iPhone users unwittingly agree to 1/1,000,000 probably 
+relying on FaceID and TouchID to protect their information agree to a</p>
 <div class="footnotes">
 <hr>
 <ol><li id="fn-nist_sres"><p>NIST 906932. Performance Assessment of Face Recognition Using Super-Resolution. Shuowen Hu, Robert Maschal, S. Susan Young, Tsai Hong Hong, Jonathon P. Phillips<a href="#fnref-nist_sres" class="footnote">&#8617;</a></p></li>
diff --git a/site/public/research/02_what_computers_can_see/index.html b/site/public/research/02_what_computers_can_see/index.html
index 9389bf84..0fce1373 100644
--- a/site/public/research/02_what_computers_can_see/index.html
+++ b/site/public/research/02_what_computers_can_see/index.html
@@ -126,6 +126,7 @@
 <li>Wearing Necktie</li>
 <li>Wearing Necklace</li>
 </ul>
+<p>for i in {1..9};do wget <a href="http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_0$i.MP4;done;for">http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_0$i.MP4;done;for</a> i in {10..20}; do wget <a href="http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_$i.MP4;done">http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_$i.MP4;done</a></p>
 <h2>From Market 1501</h2>
 <p>The 27 attributes are:</p>
 <table>
@@ -269,6 +270,24 @@ Visibility boolean for each keypoint
 Region annotations (upper clothes, lower clothes, dress, socks, shoes, hands, gloves, neck, face, hair, hat, sunglasses, bag, occluder)
 Body type (male, female or child)</p>
 <p>source: <a href="https://www2.eecs.berkeley.edu/Research/Projects/CS/vision/shape/h3d/">https://www2.eecs.berkeley.edu/Research/Projects/CS/vision/shape/h3d/</a></p>
+<h2>From Leeds Sports Pose</h2>
+<p>=INDEX(A2:A9,MATCH(datasets!D1,B2:B9,0))
+=VLOOKUP(A2, datasets!A:J, 7, FALSE)</p>
+<p>Right ankle
+Right knee
+Right hip
+Left hip
+Left knee
+Left ankle
+Right wrist
+Right elbow
+Right shoulder
+Left shoulder
+Left elbow
+Left wrist
+Neck
+Head top</p>
+<p>source: <a href="http://web.archive.org/web/20170915023005/sam.johnson.io/research/lsp.html">http://web.archive.org/web/20170915023005/sam.johnson.io/research/lsp.html</a></p>
 </section>
 
   </div>
diff --git a/site/public/research/index.html b/site/public/research/index.html
index 303732f8..0ef57043 100644
--- a/site/public/research/index.html
+++ b/site/public/research/index.html
@@ -26,8 +26,22 @@
   </header>
   <div class="content content-">
     
-  <section><h1>Research Blog</h1>
-</section>
+  <section>
+    <h1>Research</h1>
+    <div class='meta'>
+      <div>
+        <div class='gray'>Posted</div>
+        <div>2018-12-15</div>
+      </div>
+      <div>
+        <div class='gray'>By</div>
+        <div>Adam Harvey</div>
+      </div>
+      
+    </div>
+  </section>
+
+  
 
   </div>
   <footer>
-- 
cgit v1.2.3-70-g09d2


From 07dd05f733c8618ea8dc687f7a48a7add6f5a83b Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 14:42:20 +0200
Subject: fix

---
 megapixels/app/site/loader.py                      |  5 +-
 scraper/client/paper/paper.verify.js               | 11 +--
 .../datasets/50_people_one_question/index.html     | 25 +++----
 site/public/datasets/brainwash/index.html          | 78 +++++++++++-----------
 site/public/datasets/celeba/index.html             | 25 +++----
 site/public/datasets/cofw/index.html               | 28 ++++----
 site/public/datasets/duke_mtmc/index.html          | 50 +++++++-------
 site/public/datasets/hrt_transgender/index.html    | 37 +++++-----
 site/public/datasets/lfw/index.html                | 37 +++++-----
 site/public/datasets/market_1501/index.html        | 25 +++----
 site/public/datasets/msceleb/index.html            | 37 +++++-----
 site/public/datasets/pipa/index.html               | 25 +++----
 site/public/datasets/uccs/index.html               | 52 +++++++--------
 site/public/datasets/viper/index.html              | 37 +++++-----
 site/public/research/index.html                    | 18 +----
 15 files changed, 223 insertions(+), 267 deletions(-)

(limited to 'site')

diff --git a/megapixels/app/site/loader.py b/megapixels/app/site/loader.py
index d150942c..779f68ba 100644
--- a/megapixels/app/site/loader.py
+++ b/megapixels/app/site/loader.py
@@ -85,9 +85,8 @@ def parse_metadata(fn, sections):
     metadata['meta'] = load_json(dataset_path)
     if not metadata['meta']:
       print("Bad metadata? {}".format(dataset_path))
-  else:
-    print(metadata['slug'])
-    print("{} does not exist!".format(dataset_path))
+  elif 'datasets' in fn:
+    print("/!\\ {} does not exist!".format(dataset_path))
   if 'meta' not in metadata or not metadata['meta']: # dude
     metadata['meta'] = {}
 
diff --git a/scraper/client/paper/paper.verify.js b/scraper/client/paper/paper.verify.js
index fcebac02..25117ff1 100644
--- a/scraper/client/paper/paper.verify.js
+++ b/scraper/client/paper/paper.verify.js
@@ -52,7 +52,7 @@ class PaperVerify extends Component {
     let newState = {}
 
     if (oldSha256 && sha256 !== oldSha256) {
-      console.log('update verification')
+      // console.log('update verification')
       this.props.actions.getAddress(sha256)
       this.props.actions.getVerification(sha256)
       const citationState = this.getCitationState(sha256)
@@ -60,7 +60,7 @@ class PaperVerify extends Component {
         ...initialState,
         ...citationState,
         ...address.paper,
-        pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)),
+        pdfIndex: citationState.citation.pdf.findIndex(el => el.match(/^https:/)),
       }
       this.setState(newState)
     } else if (verify && !verify.loading && verify.paper && (!oldPaper || oldPaper !== verify.paper)) {
@@ -71,7 +71,7 @@ class PaperVerify extends Component {
           ...initialState,
           ...citationState,
           ...address.paper,
-          pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)),
+          pdfIndex: citationState.citation.pdf.findIndex(el => el.match(/^https:/)),
         }
         this.setState(newState)
       } else {
@@ -81,7 +81,7 @@ class PaperVerify extends Component {
         newState = {
           ...citationState,
           ...address.paper,
-          pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)),
+          pdfIndex: citationState.citation.pdf.findIndex(el => el.match(/^https:/)),
           uses_dataset: paper.uses_dataset,
           images_in_paper: paper.images_in_paper,
           verified_by: paper.verified_by,
@@ -170,7 +170,8 @@ class PaperVerify extends Component {
     const { paperInfo, sortedCitations } = this.props.api
     const citations = sortedCitations || paperInfo.citations || []
     let citationIndex = citations.findIndex(f => f.id === this.state.citation.id)
-
+    console.log(sortedCitations)
+    console.log('going to next', key, citationIndex)
     if (citationIndex === -1) {
       history.push('/paper/' + key + '/info/')
     } else {
diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index 988ce2dc..8e3d2d2b 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -33,7 +33,7 @@
 <p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -45,30 +45,31 @@
 	</div>
 	 -->
 	<p>
-		To understand how 50 People One Question Dataset has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how 50 People One Question Dataset has been used around the world for commercial, military and academic research; publicly available research citing 50 People One Question is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] 50 People One Question Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section>
+</section>
+ --><section>
 
 
   <div class="hr-wave-holder">
@@ -76,13 +77,13 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index 20f2f096..c97349aa 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -4,7 +4,7 @@
   <title>MegaPixels</title>
   <meta charset="utf-8" />
   <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="Brainwash is a dataset of webcam images taken from the Brainwash Cafe in San Francisco" />
+  <meta name="description" content="Brainwash is a dataset of webcam images taken from the Brainwash Cafe in San Francisco in 2014" />
   <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' />
@@ -26,18 +26,16 @@
   </header>
   <div class="content content-dataset">
     
-  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/brainwash/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>Brainwash is a dataset of webcam images taken from the Brainwash Cafe in San Francisco</span></div><div class='hero_subdesc'><span class='bgpad'>The Brainwash dataset includes 11,918 images of "everyday life of a busy downtown cafe" and is used for training head detection algorithms
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2015</div></div><div><div class='gray'>Images</div><div>11,918</div></div><div><div class='gray'>Faces</div><div>91,146</div></div><div><div class='gray'>Created by</div><div>Stanford Department of Computer Science</div></div><div><div class='gray'>Funded by</div><div>Max Planck Center for Visual Computing and Communication</div></div><div><div class='gray'>Location</div><div>Brainwash Cafe, San Franscisco</div></div><div><div class='gray'>Purpose</div><div>Training face detection</div></div><div><div class='gray'>Website</div><div><a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">stanford.edu</a></div></div><div><div class='gray'>Paper</div><div><a href="http://arxiv.org/abs/1506.04878">End-to-End People Detection in Crowded Scenes</a></div></div><div><div class='gray'>Explicit Consent</div><div>No</div></div></div></div><h2>Brainwash Dataset</h2>
-<p>(PAGE UNDER DEVELOPMENT)</p>
-<p><em>Brainwash</em> is a face detection dataset created from the Brainwash Cafe's livecam footage including 11,918 images of "everyday life of a busy downtown cafe<a class="footnote_shim" name="[^readme]_1"> </a><a href="#[^readme]" class="footnote" title="Footnote 1">1</a>". The images are used to develop face detection algorithms for the "challenging task of detecting people in crowded scenes" and tracking them.</p>
-<p>Before closing in 2017, Brainwash Cafe was a "cafe and laundromat" located in San Francisco's SoMA district. The cafe published a publicy available livestream from the cafe with a view of the cash register, performance stage, and seating area.</p>
-<p>Since it's publication by Stanford in 2015, the Brainwash dataset has appeared in several notable research papers. In September 2016 four researchers from the National University of Defense Technology in Changsha, China used the Brainwash dataset for a research study on "people head detection in crowded scenes", concluding that their algorithm "achieves superior head detection performance on the crowded scenes dataset<a class="footnote_shim" name="[^localized_region_context]_1"> </a><a href="#[^localized_region_context]" class="footnote" title="Footnote 2">2</a>". And again in 2017 three researchers at the National University of Defense Technology used Brainwash for a study on object detection noting "the data set used in our experiment is shown in Table 1, which includes one scene of the brainwash dataset<a class="footnote_shim" name="[^replacement_algorithm]_1"> </a><a href="#[^replacement_algorithm]" class="footnote" title="Footnote 3">3</a>".</p>
-</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/brainwash/assets/00425000_960.jpg' alt=' An sample image from the Brainwash dataset used for training face and head detection algorithms for surveillance. The datset contains about 12,000 images. License: Open Data Commons Public Domain Dedication (PDDL)'><div class='caption'> An sample image from the Brainwash dataset used for training face and head detection algorithms for surveillance. The datset contains about 12,000 images. License: Open Data Commons Public Domain Dedication (PDDL)</div></div></section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/brainwash/assets/brainwash_montage.jpg' alt=' 49 of the 11,918 images included in the Brainwash dataset. License: Open Data Commons Public Domain Dedication (PDDL)'><div class='caption'> 49 of the 11,918 images included in the Brainwash dataset. License: Open Data Commons Public Domain Dedication (PDDL)</div></div></section><section>
+  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/brainwash/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>Brainwash is a dataset of webcam images taken from the Brainwash Cafe in San Francisco in 2014</span></div><div class='hero_subdesc'><span class='bgpad'>The Brainwash dataset includes 11,918 images of "everyday life of a busy downtown cafe" and is used for training head detection surveillance algorithms
+</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2015</div></div><div><div class='gray'>Images</div><div>11,918</div></div><div><div class='gray'>Faces</div><div>91,146</div></div><div><div class='gray'>Created by</div><div>Stanford University (US)<br>Max Planck Institute for Informatics (DE)</div></div><div><div class='gray'>Funded by</div><div>Max Planck Center for Visual Computing and Communication</div></div><div><div class='gray'>Purpose</div><div>Head detection</div></div><div><div class='gray'>Download Size</div><div>4.1GB</div></div><div><div class='gray'>Website</div><div><a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">stanford.edu</a></div></div></div></div><h2>Brainwash Dataset</h2>
+<p><em>Brainwash</em> is a head detection dataset created from San Francisco's Brainwash Cafe livecam footage. It includes 11,918 images of "everyday life of a busy downtown cafe"<a class="footnote_shim" name="[^readme]_1"> </a><a href="#[^readme]" class="footnote" title="Footnote 1">1</a> captured at 100 second intervals throught the entire day. Brainwash dataset was captured during 3 days in 2014: October 27, November 13, and November 24. According the author's reserach paper introducing the dataset, the images were acquired with the help of Angelcam.com [cite orig paper].</p>
+<p>Brainwash is not a widely used dataset but since its publication by Stanford University in 2015, it has notably appeared in several research papers from the National University of Defense Technology in Changsha, China. In 2016 and in 2017 researchers there conducted studies on detecting people's heads in crowded scenes for the purpose of surveillance <a class="footnote_shim" name="[^localized_region_context]_1"> </a><a href="#[^localized_region_context]" class="footnote" title="Footnote 2">2</a> <a class="footnote_shim" name="[^replacement_algorithm]_1"> </a><a href="#[^replacement_algorithm]" class="footnote" title="Footnote 3">3</a>.</p>
+<p>If you happen to have been at Brainwash cafe in San Franscisco at any time on October 26, November 13, or November 24 in 2014 you are most likely included in the Brainwash dataset.</p>
+</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/brainwash/assets/brainwash_mean_overlay.jpg' alt=' The pixel-averaged image of all Brainwash dataset images is shown with 81,973 head annotations drawn from the Brainwash training partition. (c) Adam Harvey'><div class='caption'> The pixel-averaged image of all Brainwash dataset images is shown with 81,973 head annotations drawn from the Brainwash training partition. (c) Adam Harvey</div></div></section><section>
   <h3>Who used Brainwash Dataset?</h3>
 
   <p>
-    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
-    to see yearly totals.  These charts show at most the top 10 countries.
+    This bar chart presents a ranking of the top countries where dataset citations originated.  Mouse over individual columns to see yearly totals. These charts show at most the top 10 countries.
   </p>
  
  </section>
@@ -46,18 +44,11 @@
 <!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
 </div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
-</section><section>
-  <p>
-    These pie charts show overall totals based on country and institution type.
-  </p>
- 
- </section>
-
-<section class="applet_container">
+</section><section class="applet_container">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -69,55 +60,62 @@
 	</div>
 	 -->
 	<p>
-		To understand how Brainwash Dataset has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how Brainwash Dataset has been used around the world for commercial, military and academic research; publicly available research citing Brainwash Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] Brainwash Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section><p>Add more analysis here</p>
-</section><section>
-
-
-  <div class="hr-wave-holder">
-      <div class="hr-wave-line hr-wave-line1"></div>
-      <div class="hr-wave-line hr-wave-line2"></div>
-  </div>
-
-  <h2>Supplementary Information</h2>
-</section><section class="applet_container">
+</section>
+ --><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
-</section><section><h3>Additional Information</h3>
+</section><section>
+
+
+  <div class="hr-wave-holder">
+      <div class="hr-wave-line hr-wave-line1"></div>
+      <div class="hr-wave-line hr-wave-line2"></div>
+  </div>
+
+  <h3>Supplementary Information</h3>
+  
+</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/brainwash/assets/00425000_960.jpg' alt=' An sample image from the Brainwash dataset used for training face and head detection algorithms for surveillance. The datset contains about 12,000 images. License: Open Data Commons Public Domain Dedication (PDDL)'><div class='caption'> An sample image from the Brainwash dataset used for training face and head detection algorithms for surveillance. The datset contains about 12,000 images. License: Open Data Commons Public Domain Dedication (PDDL)</div></div></section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/brainwash/assets/brainwash_montage.jpg' alt=' 49 of the 11,918 images included in the Brainwash dataset. License: Open Data Commons Public Domain Dedication (PDDL)'><div class='caption'> 49 of the 11,918 images included in the Brainwash dataset. License: Open Data Commons Public Domain Dedication (PDDL)</div></div></section><section><h4>Additional Resources</h4>
 <ul>
 <li>The dataset author spoke about his research at the CVPR conference in 2016 <a href="https://www.youtube.com/watch?v=Nl2fBKxwusQ">https://www.youtube.com/watch?v=Nl2fBKxwusQ</a></li>
 </ul>
+<p>TODO</p>
+<ul>
+<li>add bounding boxes to the header image</li>
+<li>remake montage with randomized images, with bboxes</li>
+<li>clean up intro text</li>
+<li>verify quote citations</li>
+</ul>
 </section><section><ul class="footnotes"><li><a name="[^readme]" class="footnote_shim"></a><span class="backlinks"><a href="#[^readme]_1">a</a></span><p>"readme.txt" <a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">https://exhibits.stanford.edu/data/catalog/sx925dc9385</a>.</p>
 </li><li><a name="[^localized_region_context]" class="footnote_shim"></a><span class="backlinks"><a href="#[^localized_region_context]_1">a</a></span><p>Li, Y. and Dou, Y. and Liu, X. and Li, T. Localized Region Context and Object Feature Fusion for People Head Detection. ICIP16 Proceedings. 2016. Pages 594-598.</p>
 </li><li><a name="[^replacement_algorithm]" class="footnote_shim"></a><span class="backlinks"><a href="#[^replacement_algorithm]_1">a</a></span><p>Zhao. X, Wang Y, Dou, Y. A Replacement Algorithm of Non-Maximum Suppression Base on Graph Clustering.</p>
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index 07522561..e958cbef 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -33,7 +33,7 @@
 <p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -45,30 +45,31 @@
 	</div>
 	 -->
 	<p>
-		To understand how CelebA Dataset has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how CelebA Dataset has been used around the world for commercial, military and academic research; publicly available research citing Large-scale CelebFaces Attributes Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] CelebA Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section>
+</section>
+ --><section>
 
 
   <div class="hr-wave-holder">
@@ -76,13 +77,13 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 99d4a9ef..7ac30579 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -43,7 +43,7 @@ To increase the number of training images, and since  COFW has the exact same la
 <p><a href="https://www.cs.cmu.edu/~peiyunh/topdown/">https://www.cs.cmu.edu/~peiyunh/topdown/</a></p>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -55,30 +55,31 @@ To increase the number of training images, and since  COFW has the exact same la
 	</div>
 	 -->
 	<p>
-		To understand how COFW Dataset has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how COFW Dataset has been used around the world for commercial, military and academic research; publicly available research citing Caltech Occluded Faces in the Wild is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] COFW Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section>
+</section>
+ --><section>
 
 
   <div class="hr-wave-holder">
@@ -86,13 +87,13 @@ To increase the number of training images, and since  COFW has the exact same la
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
@@ -103,8 +104,7 @@ To increase the number of training images, and since  COFW has the exact same la
   <h3>Who used COFW Dataset?</h3>
 
   <p>
-    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
-    to see yearly totals.  These charts show at most the top 10 countries.
+    This bar chart presents a ranking of the top countries where dataset citations originated.  Mouse over individual columns to see yearly totals. These charts show at most the top 10 countries.
   </p>
  
  </section>
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index 431cf7ff..9664181e 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -4,7 +4,7 @@
   <title>MegaPixels</title>
   <meta charset="utf-8" />
   <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="Duke MTMC is a dataset of CCTV footage of students at Duke University" />
+  <meta name="description" content="Duke MTMC is a dataset of surveillance camera footage of students on Duke University campus" />
   <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' />
@@ -26,12 +26,17 @@
   </header>
   <div class="content content-dataset">
     
-  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/duke_mtmc/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Duke MTMC</span> is a dataset of CCTV footage of students at Duke University</span></div><div class='hero_subdesc'><span class='bgpad'>Duke MTMC contains over 2 million video frames and 2,000 unique identities collected from 8 cameras at Duke University campus in March 2014
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>March 19, 2014</div></div><div><div class='gray'>Cameras</div><div>8</div></div><div><div class='gray'>Video Frames</div><div>2,000,000</div></div><div><div class='gray'>Identities</div><div>Over 2,000</div></div><div><div class='gray'>Used for</div><div>Person re-identification, <br>face recognition</div></div><div><div class='gray'>Sector</div><div>Academic</div></div><div><div class='gray'>Website</div><div><a href="http://vision.cs.duke.edu/DukeMTMC/">duke.edu</a></div></div></div></div><h2>Duke Multi-Target, Multi-Camera Tracking Dataset (Duke MTMC)</h2>
-<p>(PAGE UNDER DEVELOPMENT)</p>
+  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/duke_mtmc/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Duke MTMC</span> is a dataset of surveillance camera footage of students on Duke University campus</span></div><div class='hero_subdesc'><span class='bgpad'>Duke MTMC contains over 2 million video frames and 2,000 unique identities collected from 8 HD cameras at Duke University campus in March 2014
+</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Created</div><div>2014</div></div><div><div class='gray'>Identities</div><div>Over 2,700</div></div><div><div class='gray'>Used for</div><div>Face recognition, person re-identification</div></div><div><div class='gray'>Created by</div><div>Computer Science Department, Duke University, Durham, US</div></div><div><div class='gray'>Website</div><div><a href="http://vision.cs.duke.edu/DukeMTMC/">duke.edu</a></div></div></div></div><h2>Duke Multi-Target, Multi-Camera Tracking Dataset (Duke MTMC)</h2>
+<p>[ PAGE UNDER DEVELOPMENT ]</p>
+<p>Duke MTMC is a dataset of video recorded on Duke University campus during for the purpose of training, evaluating, and improving <em>multi-target multi-camera tracking</em>. The videos were recorded during February and March 2014 and cinclude</p>
+<p>Includes a total of 888.8 minutes of video (ind. verified)</p>
+<p>"We make available a new data set that has more than 2 million frames and more than 2,700 identities. It consists of 8×85 minutes of 1080p video recorded at 60 frames per second from 8 static cameras deployed on the Duke University campus during periods between lectures, when pedestrian traffic is heavy."</p>
+<p>The dataset includes approximately 2,000 annotated identities appearing in 85 hours of video from 8 cameras located throughout Duke University's campus.</p>
+</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/duke_mtmc/assets/duke_mtmc_cam5_average_comp.jpg' alt=' Duke MTMC pixel-averaged image of camera #5 is shown with the bounding boxes for each student drawn in white. (c) Adam Harvey'><div class='caption'> Duke MTMC pixel-averaged image of camera #5 is shown with the bounding boxes for each student drawn in white. (c) Adam Harvey</div></div></section><section><p>According to the dataset authors,</p>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -43,35 +48,35 @@
 	</div>
 	 -->
 	<p>
-		To understand how Duke MTMC Dataset has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how Duke MTMC Dataset has been used around the world for commercial, military and academic research; publicly available research citing Duke Multi-Target, Multi-Camera Tracking Project is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] Duke MTMC Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section>
+</section>
+ --><section>
   <h3>Who used Duke MTMC Dataset?</h3>
 
   <p>
-    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
-    to see yearly totals.  These charts show at most the top 10 countries.
+    This bar chart presents a ranking of the top countries where dataset citations originated.  Mouse over individual columns to see yearly totals. These charts show at most the top 10 countries.
   </p>
  
  </section>
@@ -80,14 +85,7 @@
 <!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
 </div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
-</section><section>
-  <p>
-    These pie charts show overall totals based on country and institution type.
-  </p>
- 
- </section>
-
-<section class="applet_container">
+</section><section class="applet_container">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 
@@ -97,13 +95,13 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index 7e10c2fb..ed36abb5 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -32,8 +32,7 @@
   <h3>Who used HRT Transgender?</h3>
 
   <p>
-    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
-    to see yearly totals.  These charts show at most the top 10 countries.
+    This bar chart presents a ranking of the top countries where dataset citations originated.  Mouse over individual columns to see yearly totals. These charts show at most the top 10 countries.
   </p>
  
  </section>
@@ -42,18 +41,11 @@
 <!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
 </div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
-</section><section>
-  <p>
-    These pie charts show overall totals based on country and institution type.
-  </p>
- 
- </section>
-
-<section class="applet_container">
+</section><section class="applet_container">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -65,30 +57,31 @@
 	</div>
 	 -->
 	<p>
-		To understand how HRT Transgender has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how HRT Transgender has been used around the world for commercial, military and academic research; publicly available research citing HRT Transgender Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] HRT Transgender ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section>
+</section>
+ --><section>
 
 
   <div class="hr-wave-holder">
@@ -96,13 +89,13 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index 9cbf2e11..22384d77 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -46,7 +46,7 @@
 <p>The <em>Names and Faces</em> dataset was the first face recognition dataset created entire from online photos. However, <em>Names and Faces</em> and <em>LFW</em> are not the first face recognition dataset created entirely "in the wild". That title belongs to the <a href="/datasets/ucd_faces/">UCD dataset</a>. Images obtained "in the wild" means using an image without explicit consent or awareness from the subject or photographer.</p>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -58,35 +58,35 @@
 	</div>
 	 -->
 	<p>
-		To understand how LFW has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how LFW has been used around the world for commercial, military and academic research; publicly available research citing Labeled Faces in the Wild is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] LFW ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section>
+</section>
+ --><section>
   <h3>Who used LFW?</h3>
 
   <p>
-    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
-    to see yearly totals.  These charts show at most the top 10 countries.
+    This bar chart presents a ranking of the top countries where dataset citations originated.  Mouse over individual columns to see yearly totals. These charts show at most the top 10 countries.
   </p>
  
  </section>
@@ -95,14 +95,7 @@
 <!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
 </div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
-</section><section>
-  <p>
-    These pie charts show overall totals based on country and institution type.
-  </p>
- 
- </section>
-
-<section class="applet_container">
+</section><section class="applet_container">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 
@@ -112,13 +105,13 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index b7e68c47..9a05d20e 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -31,7 +31,7 @@
 <p>(PAGE UNDER DEVELOPMENT)</p>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -43,30 +43,31 @@
 	</div>
 	 -->
 	<p>
-		To understand how Market 1501 has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how Market 1501 has been used around the world for commercial, military and academic research; publicly available research citing Market 1501 Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] Market 1501 ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section>
+</section>
+ --><section>
 
 
   <div class="hr-wave-holder">
@@ -74,13 +75,13 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index 50788aad..0ddf0c68 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -35,8 +35,7 @@
   <h3>Who used MsCeleb?</h3>
 
   <p>
-    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
-    to see yearly totals.  These charts show at most the top 10 countries.
+    This bar chart presents a ranking of the top countries where dataset citations originated.  Mouse over individual columns to see yearly totals. These charts show at most the top 10 countries.
   </p>
  
  </section>
@@ -45,18 +44,11 @@
 <!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
 </div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
-</section><section>
-  <p>
-    These pie charts show overall totals based on country and institution type.
-  </p>
- 
- </section>
-
-<section class="applet_container">
+</section><section class="applet_container">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -68,30 +60,31 @@
 	</div>
 	 -->
 	<p>
-		To understand how MsCeleb has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how MsCeleb has been used around the world for commercial, military and academic research; publicly available research citing Microsoft Celebrity Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] MsCeleb ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section><p>Add more analysis here</p>
+</section>
+ --><section><p>Add more analysis here</p>
 </section><section>
 
 
@@ -100,13 +93,13 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index 09baca99..9e7eb164 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -31,7 +31,7 @@
 <p>(PAGE UNDER DEVELOPMENT)</p>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -43,30 +43,31 @@
 	</div>
 	 -->
 	<p>
-		To understand how PIPA Dataset has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how PIPA Dataset has been used around the world for commercial, military and academic research; publicly available research citing People in Photo Albums Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] PIPA Dataset ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section>
+</section>
+ --><section>
 
 
   <div class="hr-wave-holder">
@@ -74,13 +75,13 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index ca106022..2477c9f8 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -4,7 +4,7 @@
   <title>MegaPixels</title>
   <meta charset="utf-8" />
   <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="Unconstrained College Students (UCCS) is a dataset of images ..." />
+  <meta name="description" content="Unconstrained College Students (UCCS) is a dataset of long-range surveillance photos of students taken without their knowledge" />
   <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' />
@@ -26,12 +26,12 @@
   </header>
   <div class="content content-dataset">
     
-  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of images ...</span></div><div class='hero_subdesc'><span class='bgpad'>The UCCS dataset includes ...
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>Unconstrained College Students ...</h2>
+  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of long-range surveillance photos of students taken without their knowledge</span></div><div class='hero_subdesc'><span class='bgpad'>The UCCS dataset includes 16,149 images and 1,732 identities of students at University of Colorado Colorado Springs campus and is used for face recognition and face detection
+</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2018</div></div><div><div class='gray'>Images</div><div>16,149</div></div><div><div class='gray'>Identities</div><div>1,732</div></div><div><div class='gray'>Used for</div><div>Face recognition, face detection</div></div><div><div class='gray'>Created by</div><div>Unviversity of Colorado Colorado Springs (US)</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, ONR MURI, Amry SBIR, SOCOM SBIR</div></div><div><div class='gray'>Website</div><div><a href="https://vast.uccs.edu/Opensetface/">vast.uccs.edu</a></div></div></div></div><h2>Unconstrained College Students ...</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
-</section><section>
+</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/uccs_mean_bboxes_comp.jpg' alt=' The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey'><div class='caption'> The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey</div></div></section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -43,35 +43,35 @@
 	</div>
 	 -->
 	<p>
-		To understand how UCCS has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how UCCS has been used around the world for commercial, military and academic research; publicly available research citing UnConstrained College Students Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] UCCS ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section>
+</section>
+ --><section>
   <h3>Who used UCCS?</h3>
 
   <p>
-    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
-    to see yearly totals.  These charts show at most the top 10 countries.
+    This bar chart presents a ranking of the top countries where dataset citations originated.  Mouse over individual columns to see yearly totals. These charts show at most the top 10 countries.
   </p>
  
  </section>
@@ -80,14 +80,7 @@
 <!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
 </div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
-</section><section>
-  <p>
-    These pie charts show overall totals based on country and institution type.
-  </p>
- 
- </section>
-
-<section class="applet_container">
+</section><section class="applet_container">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 
@@ -97,20 +90,20 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
-</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/uccs_bboxes_grayscale.jpg' alt='Bounding box visualization'><div class='caption'>Bounding box visualization</div></div></section><section><h3>Research Notes</h3>
+</section><section><h3>Research Notes</h3>
 <p>The original Sapkota and Boult dataset, from which UCCS is derived, received funding from<sup class="footnote-ref" id="fnref-funding_sb"><a href="#fn-funding_sb">1</a></sup>:</p>
 <ul>
 <li>ONR (Office of Naval Research) MURI (The Department of Defense Multidisciplinary University Research Initiative) grant N00014-08-1-0638</li>
@@ -123,6 +116,11 @@
 <li>ODNI (Office of Director of National Intelligence)</li>
 <li>IARPA (Intelligence Advance Research Projects Activity) R&amp;D contract 2014-14071600012</li>
 </ul>
+<p>" In most face detection/recognition datasets, the majority of images are “posed”, i.e. the subjects know they are being photographed, and/or the images are selected for publication in public media. Hence, blurry, occluded and badly illuminated images are generally uncommon in these datasets. In addition, most of these challenges are close-set, i.e. the list of subjects in the gallery is the same as the one used for testing.</p>
+<p>This challenge explores more unconstrained data, by introducing the new UnConstrained College Students (UCCS) dataset, where subjects are photographed using a long-range high-resolution surveillance camera without their knowledge. Faces inside these images are of various poses, and varied levels of blurriness and occlusion. The challenge also creates an open set recognition problem, where unknown people will be seen during testing and must be rejected.</p>
+<p>With this challenge, we hope to foster face detection and recognition research towards surveillance applications that are becoming more popular and more required nowadays, and where no automatic recognition algorithm has proven to be useful yet.</p>
+<p>UnConstrained College Students (UCCS) Dataset</p>
+<p>The UCCS dataset was collected over several months using Canon 7D camera fitted with Sigma 800mm F5.6 EX APO DG HSM lens, taking images at one frame per second, during times when many students were walking on the sidewalk. "</p>
 <div class="footnotes">
 <hr>
 <ol><li id="fn-funding_sb"><p>Sapkota, Archana and Boult, Terrance. "Large Scale Unconstrained Open Set Face Database." 2013.<a href="#fnref-funding_sb" class="footnote">&#8617;</a></p></li>
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index f78d1c04..e94568a3 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -35,8 +35,7 @@
   <h3>Who used VIPeR?</h3>
 
   <p>
-    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
-    to see yearly totals.  These charts show at most the top 10 countries.
+    This bar chart presents a ranking of the top countries where dataset citations originated.  Mouse over individual columns to see yearly totals. These charts show at most the top 10 countries.
   </p>
  
  </section>
@@ -45,18 +44,11 @@
 <!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
 </div> -->
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
-</section><section>
-  <p>
-    These pie charts show overall totals based on country and institution type.
-  </p>
- 
- </section>
-
-<section class="applet_container">
+</section><section class="applet_container">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -68,30 +60,31 @@
 	</div>
 	 -->
 	<p>
-		To understand how VIPeR has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how VIPeR has been used around the world for commercial, military and academic research; publicly available research citing Viewpoint Invariant Pedestrian Recognition is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] VIPeR ... Standardized paragraph of text about the map. 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.
 	</p>
-</section><section>
+</section>
+ --><section>
 
 
   <div class="hr-wave-holder">
@@ -99,13 +92,13 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section><section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/research/index.html b/site/public/research/index.html
index 0ef57043..303732f8 100644
--- a/site/public/research/index.html
+++ b/site/public/research/index.html
@@ -26,22 +26,8 @@
   </header>
   <div class="content content-">
     
-  <section>
-    <h1>Research</h1>
-    <div class='meta'>
-      <div>
-        <div class='gray'>Posted</div>
-        <div>2018-12-15</div>
-      </div>
-      <div>
-        <div class='gray'>By</div>
-        <div>Adam Harvey</div>
-      </div>
-      
-    </div>
-  </section>
-
-  
+  <section><h1>Research Blog</h1>
+</section>
 
   </div>
   <footer>
-- 
cgit v1.2.3-70-g09d2


From 83858f95425278d44e7f39177e141e7b82c0022c Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 17:38:55 +0200
Subject: search icon

---
 client/table/citations.table.js |   4 ++--
 client/table/tabulator.css      |  12 +++++++++++-
 site/assets/img/icon-search.png | Bin 0 -> 1196 bytes
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 site/assets/img/icon-search.png

(limited to 'site')

diff --git a/client/table/citations.table.js b/client/table/citations.table.js
index 4ee1a0c9..f9599f5d 100644
--- a/client/table/citations.table.js
+++ b/client/table/citations.table.js
@@ -35,6 +35,7 @@ class CitationsTable extends Component {
   updateCitations(){
     const { paper, citations } = this.props.payload.data
     if (!citations.length) this.setState({ formattedCitations: [] })
+      console.log(citations.filter(a => a.title.match('Coarse')))
     const formattedCitations = citations.sort((a,b) => a.title.localeCompare(b.title)).map(citation => {
       const pdf_link = (citation.pdf && citation.pdf.length)
           ? citation.pdf[0]
@@ -80,7 +81,6 @@ class CitationsTable extends Component {
   render() {
     const { formattedCitations, filteredCitations } = this.state
     if (!formattedCitations.length) return <Loader />
-    // console.log(formattedCitations)
     return (
       <div className='citationBrowser'>
         <input
@@ -88,7 +88,7 @@ class CitationsTable extends Component {
           value={this.state.q}
           onChange={e => this.updateFilter(e.target.value)}
           className='q'
-          placeholder='Filter by title/institution'
+          placeholder='Enter text to search citations...'
         />
         <ReactTabulator
           columns={citationsColumns}
diff --git a/client/table/tabulator.css b/client/table/tabulator.css
index 06bceb20..c08ad580 100644
--- a/client/table/tabulator.css
+++ b/client/table/tabulator.css
@@ -29,7 +29,17 @@
   padding: 0 5px 0 0;
 }
 
+.citationBrowser {
+  padding: 10px;
+  border-radius: 4px;
+  background: #666;
+}
 .citationBrowser .q {
   max-width: 400px;
-  margin-bottom: 4px;
+  margin-bottom: 10px;
+  background-image: url(/assets/img/icon-search.png);
+  background-position: 390px center;
+  background-repeat: no-repeat;
+  box-shadow: 0px 2px 4px rgba(0,0,0,0.2);
+  border: 0;
 }
\ No newline at end of file
diff --git a/site/assets/img/icon-search.png b/site/assets/img/icon-search.png
new file mode 100644
index 00000000..43684627
Binary files /dev/null and b/site/assets/img/icon-search.png differ
-- 
cgit v1.2.3-70-g09d2


From 36cda707b6b03a7b2aa10e6b17ca780797916060 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 19:45:15 +0200
Subject: test csv

---
 .gitignore                              |  3 +++
 client/index.js                         |  8 +++++--
 client/table/citations.table.js         | 28 ++++++++++------------
 client/table/file.table.js              | 42 +++++++++++++++++++++++++--------
 client/util/index.js                    |  9 +++++++
 package-lock.json                       |  8 +++----
 package.json                            |  2 +-
 site/content/pages/test/assets/test.csv |  8 +++++++
 site/content/pages/test/csv.md          |  4 ++--
 site/public/datasets/index.html         | 12 +++++-----
 site/public/test/csv/index.html         |  2 +-
 11 files changed, 84 insertions(+), 42 deletions(-)
 create mode 100644 site/content/pages/test/assets/test.csv

(limited to 'site')

diff --git a/.gitignore b/.gitignore
index 74a8a054..e41e7c36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,3 +170,6 @@ site/public/user_content
 
 site/datasets/final/*.csv
 
+flask.log
+flask.log.*
+
diff --git a/client/index.js b/client/index.js
index 668aebfb..5e36d341 100644
--- a/client/index.js
+++ b/client/index.js
@@ -65,14 +65,17 @@ function runApplets() {
     let opt = null
     payload.cmd = cmd
     payload.partz = cmdPartz
+    if (payload.cmd === 'load_file') {
+      payload.url = 'https://nyc3.digitaloceanspaces.com/megapixels/v1' + cmdPartz.shift()
+      return [el, payload]
+    }
+
     if (payload.partz.length) {
       opt = payload.partz.shift().trim()
       if (opt.indexOf('http') === 0) {
         dataset = null
         url = opt
       } else if (opt.indexOf('assets') === 0) {
-        let pathname = window.location.pathname.replace('index.html', '')
-        url = 'https://nyc3.digitaloceanspaces.com/megapixels/v1' + pathname + opt
         dataset = null
         // console.log(url)
       } else {
@@ -95,6 +98,7 @@ function runApplets() {
     }
     payload.dataset = dataset
     payload.url = url
+    console.log(payload)
     return [el, payload]
   }).filter(a => !!a)
   const withDataset = applets.map(a => a[1].dataset ? a[1] : null).filter(a => !!a)
diff --git a/client/table/citations.table.js b/client/table/citations.table.js
index f9599f5d..0092015f 100644
--- a/client/table/citations.table.js
+++ b/client/table/citations.table.js
@@ -2,10 +2,9 @@ import React, { Component } from 'react'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { ReactTabulator } from 'react-tabulator'
-import MultiValueFormatter from "react-tabulator/lib/formatters/MultiValueFormatter"
 
 import { Loader } from '../common'
-import { toArray, toTuples } from '../util'
+import { toArray, toTuples, domainFromUrl } from '../util'
 
 export const citationsColumns = [
   { title: 'Title', field: 'title', sorter: 'string' },
@@ -42,13 +41,7 @@ class CitationsTable extends Component {
           : (citation.doi && citation.doi.length)
             ? citation.doi[0]
             : 'https://www.semanticscholar.org/paper/' + citation.id
-      let pdf_text
-      const pdf_partz = pdf_link.split('/')[2].split('.')
-      if (pdf_partz.length > 2 && pdf_partz[pdf_partz.length - 2].length == 2) {
-        pdf_text = pdf_partz.slice(-3).join('.')
-      } else {
-        pdf_text = pdf_partz.slice(-2).join('.')
-      }
+      let pdf_text = domainFromUrl(pdf_link)
       return {
         title: citation.title,
         institution: citation.addresses.map(a => a.name).sort().join('; '),
@@ -83,13 +76,16 @@ class CitationsTable extends Component {
     if (!formattedCitations.length) return <Loader />
     return (
       <div className='citationBrowser'>
-        <input
-          type="text"
-          value={this.state.q}
-          onChange={e => this.updateFilter(e.target.value)}
-          className='q'
-          placeholder='Enter text to search citations...'
-        />
+        <div className='citationHeader'>
+          <input
+            type="text"
+            value={this.state.q}
+            onChange={e => this.updateFilter(e.target.value)}
+            className='q'
+            placeholder='Enter text to search citations...'
+          />
+          <a href=
+        </div>
         <ReactTabulator
           columns={citationsColumns}
           data={filteredCitations}
diff --git a/client/table/file.table.js b/client/table/file.table.js
index 92f5cf72..82c01ac5 100644
--- a/client/table/file.table.js
+++ b/client/table/file.table.js
@@ -1,25 +1,32 @@
 import React, { Component } from 'react'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { toArray, toTuples } from '../util'
+import { ReactTabulator } from 'react-tabulator'
 
+import { toArray, toTuples, domainFromUrl } from '../util'
 import { Loader } from '../common'
 
 import csv from 'parse-csv'
 
 class FileTable extends Component {
   state = {
-    data: []
+    keys: [],
+    data: [],
+    columns: [],
   }
   
   componentDidMount() {
+    const { payload } = this.props
     console.log(payload.url)
     fetch(payload.url, { mode: 'cors' })
       .then(r => r.text())
       .then(text => {
         try {
+          const keys = text.split('\n')[0].split(',').map(s => s.trim().replace(/\"/,''))
           const data = csv.toJSON(text, { headers: { included: true } })
-          this.setState({ data })
+          // console.log(data)
+          const columns = this.getColumns(keys, data, payload.fields)
+          this.setState({ keys, data, columns })
         } catch (e) {
           console.error("error making json:", payload.url)
           console.error(e)
@@ -27,26 +34,41 @@ class FileTable extends Component {
       })
   }
 
-  getColumns(payload) {
-    let { cmd, url, fields } = payload
-    return ((fields && fields.length) ? fields[0] : '').split(', ').map(field => {
+  getColumns(keys, data, fields) {
+    let titles = fields.length ? fields[0].split(', ') : keys
+    let numberFields = []
+    let columns = keys.map((field, i) => {
+      const title = titles[i] || field
+      if (field.match('url')) {
+        let textField = field.replace('url', 'label')
+        data.forEach(el => el[textField] = domainFromUrl(el[field]))
+        return {
+          title,
+          field: textField,
+          formatter: 'link',
+          formatterParams: { target: "_blank", urlField: field, },
+          sorter: 'string'
+        }
+      }
       switch (field) {
+        case 'images':
+        case 'year':
+          return { title, field: field.toLowerCase(), sorter: 'number' }
         default:
-          return { title: field, field: field.toLowerCase(), sorter: 'string' }
+          return { title, field: field.toLowerCase(), sorter: 'string' }
       }
     })
+    return columns
   }
 
   render() {
     const { payload } = this.props
-    const { paper, citations } = payload.data
-    const columns = getColumns(payload)
     if (!this.state.data.length) {
       return <Loader />
     }
     return (
       <ReactTabulator
-        columns={citationsColumns}
+        columns={this.state.columns}
         data={this.state.data}
         options={{
           height: 311,
diff --git a/client/util/index.js b/client/util/index.js
index 87d32ebb..e90e5466 100644
--- a/client/util/index.js
+++ b/client/util/index.js
@@ -63,6 +63,15 @@ export const percent = n => (n * 100).toFixed(1) + '%'
 export const px = (n, w) => Math.round(n * w) + 'px'
 export const clamp = (n, a, b) => n < a ? a : n < b ? n : b
 
+export const domainFromUrl = url => {
+  const partz = url.split('/')[2].split('.')
+  if (partz.length > 2 && partz[partz.length - 2].length == 2) {
+    return partz.slice(-3).join('.')
+  } else {
+    return partz.slice(-2).join('.')
+  }
+}
+
 /* URLs */
 
 export const preloadImage = opt => {
diff --git a/package-lock.json b/package-lock.json
index 4e9d6fac..43ee0cbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3673,9 +3673,9 @@
       }
     },
     "file-saver": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.0.tgz",
-      "integrity": "sha512-cYM1ic5DAkg25pHKgi5f10ziAM7RJU37gaH1XQlyNDrtUnzhC/dfoV9zf2OmF0RMKi42jG5B0JWBnPQqyj/G6g=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.1.tgz",
+      "integrity": "sha512-dCB3K7/BvAcUmtmh1DzFdv0eXSVJ9IAFt1mw3XZfAexodNRoE29l3xB2EX4wH2q8m/UTzwzEPq/ArYk98kUkBQ=="
     },
     "filename-regex": {
       "version": "2.0.1",
@@ -8623,7 +8623,7 @@
     },
     "sprintf-js": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
diff --git a/package.json b/package.json
index 6238e7e3..75fbebb7 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "exif-reader": "^1.0.2",
     "exifreader": "^2.5.0",
     "fetch-jsonp": "^1.1.3",
-    "file-saver": "^2.0.0-rc.3",
+    "file-saver": "^2.0.1",
     "history": "^4.7.2",
     "leaflet": "^1.3.4",
     "leaflet-arc": "^1.0.2",
diff --git a/site/content/pages/test/assets/test.csv b/site/content/pages/test/assets/test.csv
new file mode 100644
index 00000000..7156a814
--- /dev/null
+++ b/site/content/pages/test/assets/test.csv
@@ -0,0 +1,8 @@
+name,images,year,gender,description,url
+aardvark,100,2019,m,bim da,https://asdf.us/
+bobcat,10,2017,f,in a tree,https://asdf.us/
+cow,20,2012,f,moooo,https://asdf.us/
+doe,2,2016,f,doe a deer,https://asdf.us/
+earwig,1,2017,m,just a bug,https://i.asdf.us/
+frog,17,2018,f,ribbit ribbit,https://i.asdf.us/
+giraffe,23,2009,m,i get around,https://adsf.us/
diff --git a/site/content/pages/test/csv.md b/site/content/pages/test/csv.md
index b5f37754..85f714b4 100644
--- a/site/content/pages/test/csv.md
+++ b/site/content/pages/test/csv.md
@@ -15,6 +15,6 @@ authors: Megapixels
 ### [&larr; Back to test index](/test/)
 
 ```
-load_file /datasets/lfw/assets/lfw_names_gender_kg_min.csv
-Name, Images, Gender, Description
+load_file /site/test/assets/test.csv
+Name, Images, Year, Gender, Description, URL
 ```
diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html
index 1d2630e1..3a2dbd52 100644
--- a/site/public/datasets/index.html
+++ b/site/public/datasets/index.html
@@ -42,8 +42,8 @@
           <span class='title'>Brainwash</span>
           <div class='fields'>
             <div class='year visible'><span>2015</span></div>
-            <div class='purpose'><span>Decoding image into set of people detections.</span></div>
-            <div class='images'><span>11,918  images</span></div>
+            <div class='purpose'><span>Head detection</span></div>
+            <div class='images'><span>11,917  images</span></div>
             <div class='identities'><span></span></div>
           </div>
         </div>
@@ -90,7 +90,7 @@
           <span class='title'>MS Celeb</span>
           <div class='fields'>
             <div class='year visible'><span>2016</span></div>
-            <div class='purpose'><span>face recognition</span></div>
+            <div class='purpose'><span>Large-scale face recognition</span></div>
             <div class='images'><span>1,000,000  images</span></div>
             <div class='identities'><span>100,000 </span></div>
           </div>
@@ -114,9 +114,9 @@
           <span class='title'>Unconstrained College Students</span>
           <div class='fields'>
             <div class='year visible'><span>2018</span></div>
-            <div class='purpose'><span>Unconstrained face recognition</span></div>
+            <div class='purpose'><span>Face recognition, face detection</span></div>
             <div class='images'><span>16,149  images</span></div>
-            <div class='identities'><span>4,362 </span></div>
+            <div class='identities'><span>1,732 </span></div>
           </div>
         </div>
       </a>
@@ -126,7 +126,7 @@
           <span class='title'>VIPeR</span>
           <div class='fields'>
             <div class='year visible'><span>2007</span></div>
-            <div class='purpose'><span>pedestrian re-identification</span></div>
+            <div class='purpose'><span>Person re-identification</span></div>
             <div class='images'><span>1,264  images</span></div>
             <div class='identities'><span>632 </span></div>
           </div>
diff --git a/site/public/test/csv/index.html b/site/public/test/csv/index.html
index 3257716f..70a7d257 100644
--- a/site/public/test/csv/index.html
+++ b/site/public/test/csv/index.html
@@ -28,7 +28,7 @@
     
   <section><h1>CSV Test</h1>
 <h3><a href="/test/">&larr; Back to test index</a></h3>
-</section><section class='applet_container'><div class='applet' data-payload='{"command": "load_file /datasets/lfw/assets/lfw_names_gender_kg_min.csv", "fields": ["Name, Images, Gender, Description"]}'></div></section>
+</section><section class='applet_container'><div class='applet' data-payload='{"command": "load_file /site/test/assets/test.csv", "fields": ["Name, Images, Year, Gender, Description, URL"]}'></div></section>
 
   </div>
   <footer>
-- 
cgit v1.2.3-70-g09d2


From 79ca5c75243e4d94a7924d1bda8666123f398d9c Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 19:50:44 +0200
Subject: .

---
 site/content/pages/datasets/uccs/index.md | 70 ++++++++++++++++++++++++-------
 site/includes/map.html                    |  2 +-
 2 files changed, 55 insertions(+), 17 deletions(-)

(limited to 'site')

diff --git a/site/content/pages/datasets/uccs/index.md b/site/content/pages/datasets/uccs/index.md
index e0925e07..80ce0836 100644
--- a/site/content/pages/datasets/uccs/index.md
+++ b/site/content/pages/datasets/uccs/index.md
@@ -2,6 +2,7 @@
 
 status: published
 title: Unconstrained College Students
+slug: uccs
 desc: <span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of long-range surveillance photos of students taken without their knowledge
 subdesc: The UCCS dataset includes 16,149 images and 1,732 identities of students at University of Colorado Colorado Springs campus and is used for face recognition and face detection
 cssclass: dataset
@@ -27,6 +28,50 @@ authors: Adam Harvey
 
 (PAGE UNDER DEVELOPMENT)
 
+Unconstrained College Students (UCCS) is a dataset of long-range surveillance photos captured at University of Colorado Colorado Springs. According to the authors of two papers associated with the dataset, subjects were "photographed using a long-range high-resolution surveillance camera without their knowledge" [^funding_sb]. The images were captured using a Canon 7D digital camera fitted with a Sigma 800mm telephoto lens pointed out the window of an office. 
+
+The UCCS dataset was funded by ODNI (Office of Director of National Intelligence), IARPA (Intelligence Advance Research Projects Activity), ONR MURI Office of Naval Research and The Department of Defense Multidisciplinary University Research Initiative, Army SBIR (Small Business Innovation Research), SOCOM SBIR (Special Operations Command and Small Business Innovation Research), and the National Science Foundation.
+
+The images in UCCS include students walking between classes on campus over 19 days in 2012 - 2013. The dates include:
+
+| Year | Month | Day | Date | Time Range | Photos |
+| --- | --- | --- | --- | --- | --- |
+| 2012 | Februay | --- | 23 | - | 132 |
+| 2012 | March | --- | 6 | - | - |
+| 2012 | March | --- | 8 | - | - |
+| 2012 | March | --- | 13 | - | - |
+| 2012 | Februay | --- | 23 | - | 132 |
+| 2012 | March | --- | 6 | - | - |
+| 2012 | March | --- | 8 | - | - |
+| 2012 | March | --- | 13 | - | - |
+| 2012 | Februay | --- | 23 | - | 132 |
+| 2012 | March | --- | 6 | - | - |
+| 2012 | March | --- | 8 | - | - |
+| 2012 | March | --- | 13 | - | - |
+| 2012 | Februay | --- | 23 | - | 132 |
+| 2012 | March | --- | 6 | - | - |
+| 2012 | March | --- | 8 | - | - |
+| 2012 | March | --- | 13 | - | - |
+| 2012 | Februay | --- | 23 | - | 132 |
+| 2012 | March | --- | 6 | - | - |
+| 2012 | March | --- | 8 | - | - |
+
+
+2012-03-20
+2012-03-22
+2012-04-03
+2012-04-12
+2012-04-17
+2012-04-24
+2012-04-25
+2012-04-26
+2013-01-28
+2013-01-29
+2013-02-13
+2013-02-19
+2013-02-20
+2013-02-26
+
 ![caption: The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey](assets/uccs_mean_bboxes_comp.jpg)
 
 
@@ -36,13 +81,9 @@ authors: Adam Harvey
 
 {% include 'piechart.html' %}
 
-{% include 'supplementary_header.html' %}
-
 {% include 'citations.html' %}
 
-
-
-### Research Notes
+{% include 'supplementary_header.html' %}
 
 The original Sapkota and Boult dataset, from which UCCS is derived, received funding from[^funding_sb]:
 
@@ -57,17 +98,14 @@ The more recent UCCS version of the dataset received funding from [^funding_uccs
 - IARPA (Intelligence Advance Research Projects Activity) R&D contract 2014-14071600012
 
 
+### TODO
 
-[^funding_sb]: Sapkota, Archana and Boult, Terrance. "Large Scale Unconstrained Open Set Face Database." 2013.
-[^funding_uccs]: Günther, M. et. al. "Unconstrained Face Detection and Open-Set Face Recognition Challenge," 2018. Arxiv 1708.02337v3.
-
-
-" In most face detection/recognition datasets, the majority of images are “posed”, i.e. the subjects know they are being photographed, and/or the images are selected for publication in public media. Hence, blurry, occluded and badly illuminated images are generally uncommon in these datasets. In addition, most of these challenges are close-set, i.e. the list of subjects in the gallery is the same as the one used for testing.
+- add tabulator module for dates
+- parse dates into CSV using Python
+- get google image showing line of sight?
+- fix up quote/citations
 
-This challenge explores more unconstrained data, by introducing the new UnConstrained College Students (UCCS) dataset, where subjects are photographed using a long-range high-resolution surveillance camera without their knowledge. Faces inside these images are of various poses, and varied levels of blurriness and occlusion. The challenge also creates an open set recognition problem, where unknown people will be seen during testing and must be rejected.
+### footnotes
 
-With this challenge, we hope to foster face detection and recognition research towards surveillance applications that are becoming more popular and more required nowadays, and where no automatic recognition algorithm has proven to be useful yet.
-
-UnConstrained College Students (UCCS) Dataset
-
-The UCCS dataset was collected over several months using Canon 7D camera fitted with Sigma 800mm F5.6 EX APO DG HSM lens, taking images at one frame per second, during times when many students were walking on the sidewalk. "
\ No newline at end of file
+[^funding_sb]: Sapkota, Archana and Boult, Terrance. "Large Scale Unconstrained Open Set Face Database." 2013.
+[^funding_uccs]: Günther, M. et. al. "Unconstrained Face Detection and Open-Set Face Recognition Challenge," 2018. Arxiv 1708.02337v3.
\ No newline at end of file
diff --git a/site/includes/map.html b/site/includes/map.html
index 30c248a6..7511d4c7 100644
--- a/site/includes/map.html
+++ b/site/includes/map.html
@@ -12,7 +12,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citing {{ metadata.meta.dataset.name_full} is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citing {{ metadata.meta.dataset.name_full }} is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
-- 
cgit v1.2.3-70-g09d2


From 25f850aedbdddd17e0de8c5f2a41aace58c1413f Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 20:09:58 +0200
Subject: yes

---
 site/includes/citations.html                           | 3 ---
 site/public/datasets/50_people_one_question/index.html | 3 ---
 site/public/datasets/brainwash/index.html              | 3 ---
 site/public/datasets/celeba/index.html                 | 3 ---
 site/public/datasets/cofw/index.html                   | 3 ---
 site/public/datasets/duke_mtmc/index.html              | 3 ---
 site/public/datasets/hrt_transgender/index.html        | 3 ---
 site/public/datasets/lfw/index.html                    | 3 ---
 site/public/datasets/market_1501/index.html            | 3 ---
 site/public/datasets/msceleb/index.html                | 3 ---
 site/public/datasets/pipa/index.html                   | 3 ---
 site/public/datasets/uccs/index.html                   | 3 ---
 site/public/datasets/viper/index.html                  | 3 ---
 13 files changed, 39 deletions(-)

(limited to 'site')

diff --git a/site/includes/citations.html b/site/includes/citations.html
index 32558d4a..5cd40a29 100644
--- a/site/includes/citations.html
+++ b/site/includes/citations.html
@@ -4,9 +4,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section>
\ No newline at end of file
diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index 8e3d2d2b..540e2d0d 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -85,9 +85,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section>
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index c97349aa..5e8f3a4c 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -90,9 +90,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section>
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index e958cbef..f1ee0c22 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -85,9 +85,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h3>Research</h3>
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 7ac30579..1f5aa315 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -95,9 +95,6 @@ To increase the number of training images, and since  COFW has the exact same la
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section>
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index 9664181e..83050506 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -103,9 +103,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h2>Research Notes</h2>
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index ed36abb5..528d1c3d 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -97,9 +97,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section>
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index 22384d77..5f076fc7 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -113,9 +113,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h3>Commercial Use</h3>
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index 9a05d20e..951646e3 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -83,9 +83,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h2>Research Notes</h2>
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index 0ddf0c68..9a671c8e 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -101,9 +101,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h3>Additional Information</h3>
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index 9e7eb164..fe6a4742 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -83,9 +83,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h2>Research Notes</h2>
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index 2477c9f8..10b7603e 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -98,9 +98,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h3>Research Notes</h3>
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index e94568a3..cc4272c8 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -100,9 +100,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section>
-- 
cgit v1.2.3-70-g09d2


From 6236de3c13735b188cd087acade09224680546fb Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 22:00:57 +0200
Subject: fix column border/bg

---
 site/assets/css/css.css | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

(limited to 'site')

diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 0ee8a4f3..d2ad0f7e 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -348,6 +348,9 @@ ul {
 }
 ul li {
   margin-bottom: 8px;
+  color: #dedede;
+  font-weight: 300;
+  font-size: 13px;
 }
 
 /* misc formatting */
@@ -373,6 +376,35 @@ pre code {
 table {
   margin-bottom: 40px;
 }
+table thead{
+  text-align: left;
+}
+table, tr, td, th {
+  border: none;
+  border-collapse:collapse;
+}
+.chart table tr{
+  width: auto;
+}
+table tr{
+  display:table;
+  table-layout: fixed;
+  width:100%;
+}
+table td, table th{
+  padding:10px;
+
+}
+table tr td{
+  font-size:12px;
+}
+table tbody tr:nth-child(odd){
+  background-color:#292929;
+}
+table tbody tr:nth-child(even){
+  background-color:#333;
+}
+
 hr {
   height: 1px;
   background: #888;
@@ -810,6 +842,7 @@ page-specific formatting
 ul.map-legend{
   display: inline-block;
   margin:0;
+  font-size:14px;
 }
 ul.map-legend li{
   margin-right: 10px;
@@ -880,11 +913,14 @@ ul.map-legend li.source:before {
   flex-direction: row;
   justify-content: flex-start;
 }
+.content-about .columns .column{
+  /* on the about page use padding and bg color */
+  background: #202020;
+  padding: 20px;
+}
 .columns .column {
   font-family: Roboto, sans-serif;
   font-weight: 400;
-  background: #202020;
-  padding: 20px;
   margin: 10px;
 }
 .columns .column:first-of-type {
@@ -997,4 +1033,10 @@ ul.footnotes {
 li p {
   margin: 0; padding: 0;
   display: inline;
+}
+
+/* citation browser */
+
+.citationHeader {
+  padding-bottom: 10px
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From c78730887ed63b4c1cb83cf0f2cd7451a964c523 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 23:27:52 +0200
Subject: update about section

---
 site/content/pages/about/legal.md   |  88 +++++++++++++++++++
 site/content/pages/about/privacy.md | 164 ------------------------------------
 site/content/pages/about/terms.md   |  73 ----------------
 3 files changed, 88 insertions(+), 237 deletions(-)
 create mode 100644 site/content/pages/about/legal.md
 delete mode 100644 site/content/pages/about/privacy.md
 delete mode 100644 site/content/pages/about/terms.md

(limited to 'site')

diff --git a/site/content/pages/about/legal.md b/site/content/pages/about/legal.md
new file mode 100644
index 00000000..089f32d7
--- /dev/null
+++ b/site/content/pages/about/legal.md
@@ -0,0 +1,88 @@
+------------
+
+status: published
+title: Privacy Policy
+desc: MegaPixels Privacy Policy
+slug: privacy-policy
+cssclass: about
+published: 2018-12-04
+updated: 2018-12-04
+authors: Adam Harvey
+ 
+------------
+
+# Legal
+
+<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 href="/about/terms/">Terms</a></li>
+<li><a class="current" href="/about/privacy/">Privacy</a></li>
+</ul>
+</section>
+
+MegaPixels.cc Terms and Privacy
+
+MegaPixels is an independent art and research project about the origins and ethics of publicly available face analysis image datasets. By accessing MegaPixels (the *Service* or *Services*) you agree to the terms and conditions set forth below.
+
+### Changes
+
+We reserve the right, at our sole discretion, to modify or replace these Terms at any time. If a revision is material we will try to provide at least 30 days notice prior to any new terms taking effect. What constitutes a material change will be determined at our sole discretion.
+
+By continuing to access or use our Service after those revisions become effective, you agree to be bound by the revised terms. If you do not agree to the new terms, please stop using the Service.
+
+
+## Privacy
+
+The MegaPixels site has been designed to minimize the amount of network requests to 3rd party services and therefore prioritize the privacy of the viewer by only loading local dependencies. Additionaly, this site does not use any anaytics programs to monitor site viewers. In fact, the only data collected are the necessary server logs that used only for preventing misuse, which are deleteted at regular short-term intervals.
+
+## 3rd Party Services
+
+In order to provide certain features of the site, some 3rd party services are needed. Currently, the MegaPixels.cc site uses two 3rd party services: (1) Leaflet.js for the interactive map and (2 Digital Ocean Spaces as a condent delivery network. Both services encrypt your requests to their server using HTTPS and neither service requires storing any cookies or authentication. However, both services will store files in your web browser's local cache (local storage) to improve loading performance. None of these local storage files are using for analytics, cookie-like technologies, tracking, or any similar purpose.
+
+### Links To Other Web Sites
+
+The MegaPixels.cc contains many links to 3rd party websites, especically in the list of citations that are provided for each dataset. This website has no control over and assumes no responsibility for, the content, privacy policies, or practices of any third party web sites or services. You further acknowledge and agree that megapixels.cc shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such web sites or services.
+
+We advise you to read the terms and conditions and privacy policies of any third-party web sites or services that you visit.
+
+
+### The Information We Provide
+
+While every intention is made to verify and publish only verifiablenformation, at times amendments to accuracy may be required. In no event will the operators of this site be liable for your use or misuse of the information provided.
+
+We may terminate or suspend access to our Service immediately, without prior notice or liability, for any reason whatsoever, including without limitation if you breach the Terms.
+
+All provisions of the Terms which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
+
+### Prohibited Uses
+
+You may not access or use, or attempt to access or use, the Services to take any action that could harm us or a third party. You may not use the Services in violation of applicable laws or in violation of our or any third party’s intellectual property or other proprietary or legal rights. You further agree that you shall not attempt (or encourage or support anyone else's attempt) to circumvent, reverse engineer, decrypt, or otherwise alter or interfere with the Services, or any content thereof, or make any unauthorized use thereof. 
+
+Without prior written consent, you shall not:
+
+(i) access any part of the Services, Content, data or information you do not have permission or authorization to access;
+
+(ii) use robots, spiders, scripts, service, software or any manual or automatic device, tool, or process designed to data mine or scrape the Content, data or information from the Services, or otherwise access or collect the Content, data or information from the Services using automated means;
+
+(iii) use services, software or any manual or automatic device, tool, or process designed to circumvent any restriction, condition, or technological measure that controls access to the Services in any way, including overriding any security feature or bypassing or circumventing any access controls or use limits of the Services;
+
+(iv) cache or archive the Content (except for a public search engine’s use of spiders for creating search indices);
+
+(v) take action that imposes an unreasonable or disproportionately large load on our network or infrastructure; and
+
+(vi) do anything that could disable, damage or change the functioning or appearance of the Services, including the presentation of advertising.
+
+Engaging in a prohibited use of the Services may result in civil, criminal, and/or administrative penalties, fines, or sanctions against the user and those assisting the user.
+
+### Governing Law
+
+These Terms shall be governed and construed in accordance with the laws of Berlin, Germany, without regard to its conflict of law provisions.
+
+Our failure to enforce any right or provision of these Terms will not be considered a waiver of those rights. If any provision of these Terms is held to be invalid or unenforceable by a court, the remaining provisions of these Terms will remain in effect. These Terms constitute the entire agreement between us regarding our Service, and supersede and replace any prior agreements we might have between us regarding the Service.
+
+### Indemnity
+
+You hereby indemnify, defend and hold harmless MegaPixels (and its creators) and all officers, directors, owners, agents, information providers, affiliates, licensors and licensees (collectively, the "Indemnified Parties") from and against any and all liability and costs, including, without limitation, reasonable attorneys' fees, incurred by the Indemnified Parties in connection with any claim arising out of any breach by you or any user of your account of these Terms of Service or the foregoing representations, warranties and covenants. You shall cooperate as fully as reasonably required in the defense of any such claim. We reserves the right, at its own expense, to assume the exclusive defense and control of any matter subject to indemnification by you.
\ No newline at end of file
diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md
deleted file mode 100644
index 48598623..00000000
--- a/site/content/pages/about/privacy.md
+++ /dev/null
@@ -1,164 +0,0 @@
-------------
-
-status: published
-title: Privacy Policy
-desc: MegaPixels Privacy Policy
-slug: privacy-policy
-cssclass: about
-published: 2018-12-04
-updated: 2018-12-04
-authors: Adam Harvey
- 
-------------
-
-# Privacy Policy
-
-<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 href="/about/terms/">Terms</a></li>
-<li><a class="current" href="/about/privacy/">Privacy</a></li>
-</ul>
-</section>
-
-(TEMPORARY PAGE)
-
-A summary of our privacy policy is as follows:
-
-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.
-
-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.
-
-----
-
-A more complete legal version is below:
-
-**This is a boilerplate Privacy policy from <https://termsfeed.com/>**
-
-**Needs to be reviewed**
-
-Effective date: December 04, 2018
-
-megapixels.cc ("us", "we", or "our") operates the WebsiteName website (hereinafter referred to as the "Service").
-
-This page informs you of our policies regarding the collection, use, and disclosure of personal data when you use our Service and the choices you have associated with that data. 
-
-We use your data to provide and improve the Service. By using the Service, you agree to the collection and use of information in accordance with this policy. Unless otherwise defined in this Privacy Policy, the terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, accessible from WebsiteName
-
-## Definitions
-
-**Service**
-
-Service is the MegaPixels website operated by megapixels.cc
-
-**Personal Data**
-
-Personal Data means data about a living individual who can be identified from those data (or from those and other information either in our possession or likely to come into our possession).
-
-**Usage Data**
-
-Usage Data is data collected automatically either generated by the use of the Service or from the Service infrastructure itself 
-
-## Information Collection and Use
-
-We collect several different types of information for various purposes to provide and improve our Service to you.
-
-## Types of Data Collected
-
-### Personal Data
-
-While using our Service, we may ask you to provide us with certain personally identifiable information that can be used to contact or identify you ("Personal Data"). Personally identifiable information may include, but is not limited to:
-
-- Cookies and Usage Data
-
-### Usage Data
-
-We may also collect information how the Service is accessed and used ("Usage Data"). This Usage Data may include information such as your computer's Internet Protocol address (e.g. IP address), browser type, browser version, the pages of our Service that you visit, the time and date of your visit, the time spent on those pages, unique device identifiers and other diagnostic data.
-
-### Tracking & Cookies Data
-
-We use cookies and similar tracking technologies to track the activity on our Service and we hold certain information.
-Cookies are files with a small amount of data which may include an anonymous unique identifier. Cookies are sent to your browser from a website and stored on your device. Other tracking technologies are also used such as beacons, tags and scripts to collect and track information and to improve and analyse our Service.
-
-You can instruct your browser to refuse all cookies or to indicate when a cookie is being sent. However, if you do not accept cookies, you may not be able to use some portions of our Service.
-Examples of Cookies we use:
-
-- <strong>Session Cookies.</strong> We use Session Cookies to operate our Service.
-- <strong>Preference Cookies.</strong> We use Preference Cookies to remember your preferences and various settings.
-- <strong>Security Cookies.</strong> We use Security Cookies for security purposes.
-
-
-## Use of Data
-    
-megapixels.cc uses the collected data for various purposes:    
-
-- To provide and maintain the Service
-- To notify you about changes to our Service
-- To allow you to participate in interactive features of our Service when you choose to do so
-- To provide customer care and support
-- To provide analysis or valuable information so that we can improve the Service
-- To monitor the usage of the Service
-- To detect, prevent and address technical issues
-
-## Transfer Of Data
-
-Your information, including Personal Data, may be transferred to — and maintained on — computers located outside of your state, province, country or other governmental jurisdiction where the data protection laws may differ than those from your jurisdiction.
-
-If you are located outside Germany and choose to provide information to us, please note that we transfer the data, including Personal Data, to Germany and process it there.
-Your consent to this Privacy Policy followed by your submission of such information represents your agreement to that transfer.
-megapixels.cc will take all steps reasonably necessary to ensure that your data is treated securely and in accordance with this Privacy Policy and no transfer of your Personal Data will take place to an organization or a country unless there are adequate controls in place including the security of your data and other personal information.
-
-## Disclosure Of Data
-
-### Legal Requirements
-
-megapixels.cc may disclose your Personal Data in the good faith belief that such action is necessary to:
-
-- To comply with a legal obligation
-- To protect and defend the rights or property of megapixels.cc
-- To prevent or investigate possible wrongdoing in connection with the Service
-- To protect the personal safety of users of the Service or the public
-- To protect against legal liability
-
-
-
-## Security of Data
-
-The security of your data is important to us but remember that no method of transmission over the Internet or method of electronic storage is 100% secure. While we strive to use commercially acceptable means to protect your Personal Data, we cannot guarantee its absolute security.
-
-## Service Providers
-
-We may employ third party companies and individuals to facilitate our Service ("Service Providers"), to provide the Service on our behalf, to perform Service-related services or to assist us in analyzing how our Service is used.
-
-These third parties have access to your Personal Data only to perform these tasks on our behalf and are obligated not to disclose or use it for any other purpose.
-
- 
-
-
-## Links to Other Sites
-
-Our Service may contain links to other sites that are not operated by us. If you click a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
-We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
-
-
-## Children's Privacy
-
-Our Service does not address anyone under the age of 18 ("Children").
-
-We do not knowingly collect personally identifiable information from anyone under the age of 18. If you are a parent or guardian and you are aware that your Child has provided us with Personal Data, please contact us. If we become aware that we have collected Personal Data from children without verification of parental consent, we take steps to remove that information from our servers.
-
-
-## Changes to This Privacy Policy
-
-We may update our Privacy Policy from time to time. We will notify you of any changes by posting the new Privacy Policy on this page.
-We will let you know via email and/or a prominent notice on our Service, prior to the change becoming effective and update the "effective date" at the top of this Privacy Policy.
-You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page.
-
-
-## Contact Us
-
-If you have any questions about this Privacy Policy, please contact us:
-
-- By visiting this page on our website: <https://megapixels.cc/contact>
\ No newline at end of file
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
deleted file mode 100644
index e03bafaa..00000000
--- a/site/content/pages/about/terms.md
+++ /dev/null
@@ -1,73 +0,0 @@
-------------
-
-status: published
-title: Terms of Use
-desc: MegaPixels Terms of Use and Privacy Policy
-slug: terms
-cssclass: about
-published: 2018-12-04
-updated: 2018-12-04
-authors: Adam Harvey
- 
-------------
- 
-
-# Terms and Conditions ("Terms")
-
-<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/terms/">Terms</a></li>
-<li><a href="/about/privacy/">Privacy</a></li>
-</ul>
-</section>
-
-(TEMPORARY PAGE)
-
-(FPO: this is only example text)
-
-Last updated: December 04, 2018
-
-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").
-
-Your access to and use of the Service is conditioned on your acceptance of and compliance with these Terms. 
-
-By accessing or using the Service you agree to be bound by these Terms. If you disagree with any part of the terms then you may not access the Service. 
-
-
-### Links To Other Web Sites
-
-Our Service may contain links to third-party web sites or services that are not owned or controlled by megapixels.cc.
-
-megapixels.cc has no control over, and assumes no responsibility for, the content, privacy policies, or practices of any third party web sites or services. You further acknowledge and agree that megapixels.cc shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such web sites or services.
-
-We strongly advise you to read the terms and conditions and privacy policies of any third-party web sites or services that you visit.
-
-
-### Termination
-
-We may terminate or suspend access to our Service immediately, without prior notice or liability, for any reason whatsoever, including without limitation if you breach the Terms.
-
-All provisions of the Terms which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
-
-
-
-### Governing Law
-
-These Terms shall be governed and construed in accordance with the laws of Berlin, Germany, without regard to its conflict of law provisions.
-
-Our failure to enforce any right or provision of these Terms will not be considered a waiver of those rights. If any provision of these Terms is held to be invalid or unenforceable by a court, the remaining provisions of these Terms will remain in effect. These Terms constitute the entire agreement between us regarding our Service, and supersede and replace any prior agreements we might have between us regarding the Service.
-
-
-### Changes
-
-We reserve the right, at our sole discretion, to modify or replace these Terms at any time. If a revision is material we will try to provide at least 30 days notice prior to any new terms taking effect. What constitutes a material change will be determined at our sole discretion.
-
-By continuing to access or use our Service after those revisions become effective, you agree to be bound by the revised terms. If you do not agree to the new terms, please stop using the Service.
-
-
-### Contact Us
-
-If you have any questions about these Terms, please contact us.
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From d9ce32ede7d8aa38929f0705e92d0c022b28fba7 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 23:31:35 +0200
Subject: add build

---
 site/public/about/credits/index.html               |  88 ----------------
 site/public/about/disclaimer/index.html            |  67 ------------
 site/public/about/index.html                       |  11 +-
 site/public/about/legal/index.html                 |  86 ++++++++++++++++
 site/public/about/press/index.html                 |  14 +--
 site/public/about/privacy/index.html               |  93 ++---------------
 site/public/about/research/index.html              |  58 -----------
 .../datasets/50_people_one_question/index.html     |  11 +-
 site/public/datasets/afad/index.html               |   7 +-
 site/public/datasets/aflw/index.html               |   7 +-
 site/public/datasets/brainwash/index.html          |  11 +-
 site/public/datasets/celeba/index.html             |  11 +-
 site/public/datasets/cofw/index.html               |  11 +-
 site/public/datasets/duke_mtmc/index.html          |   4 +-
 site/public/datasets/facebook/index.html           |   7 +-
 site/public/datasets/feret/index.html              |   7 +-
 site/public/datasets/hrt_transgender/index.html    |  11 +-
 site/public/datasets/index.html                    |  31 +-----
 site/public/datasets/lfpw/index.html               |   7 +-
 site/public/datasets/lfw/index.html                |  11 +-
 site/public/datasets/market_1501/index.html        |  11 +-
 site/public/datasets/mars/index.html               | 110 --------------------
 site/public/datasets/msceleb/index.html            |  11 +-
 site/public/datasets/pipa/index.html               |   4 +-
 site/public/datasets/uccs/index.html               | 114 ++++++++++++++-------
 site/public/datasets/vgg_face2/index.html          |   7 +-
 site/public/datasets/viper/index.html              |  11 +-
 .../public/datasets/youtube_celebrities/index.html |   7 +-
 site/public/test/chart/index.html                  |   7 +-
 site/public/test/citations/index.html              |   7 +-
 site/public/test/csv/index.html                    |   7 +-
 site/public/test/datasets/index.html               |   7 +-
 site/public/test/face_search/index.html            |   7 +-
 site/public/test/gallery/index.html                |  25 ++++-
 site/public/test/index.html                        |   7 +-
 site/public/test/map/index.html                    |   7 +-
 site/public/test/name_search/index.html            |   7 +-
 site/public/test/pie_chart/index.html              |   7 +-
 38 files changed, 302 insertions(+), 614 deletions(-)
 delete mode 100644 site/public/about/credits/index.html
 delete mode 100644 site/public/about/disclaimer/index.html
 create mode 100644 site/public/about/legal/index.html
 delete mode 100644 site/public/about/research/index.html
 delete mode 100644 site/public/datasets/mars/index.html

(limited to 'site')

diff --git a/site/public/about/credits/index.html b/site/public/about/credits/index.html
deleted file mode 100644
index b4c17c4d..00000000
--- a/site/public/about/credits/index.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>MegaPixels</title>
-  <meta charset="utf-8" />
-  <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="MegaPixels Press and News" />
-  <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="/about/">About</a>
-    </div>
-  </header>
-  <div class="content content-about">
-    
-  <section><h1>Credits</h1>
-<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><h4>Team</h4>
-<ul>
-<li>Research and image analysis: Adam Harvey</li>
-<li>Development and visualizations: Jules LaPlace</li>
-<li>Produced in Partnership with Mozilla</li>
-<li>Contributing researchers: Berit Gilma, Mathana Stender</li>
-</ul>
-<h4>Code</h4>
-<p>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD</p>
-<ul>
-<li>This site uses D3.js, C3.js, and ThreeJS for visualizations.</li>
-<li><h1>Data aggregation uses Pandas and PDFMiner.Six.</h1>
-</li>
-<li>This site uses D3 and C2 for visuzations</li>
-<li>Add more here<blockquote><blockquote><blockquote><blockquote><blockquote><blockquote><blockquote><p>&gt; 26646e6adf3833f6282e9515c14ad61e485440c0</p>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</li>
-</ul>
-<h4>Data</h4>
-<ul>
-<li>link to github</li>
-<li>how it was gathered</li>
-</ul>
-</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/disclaimer/index.html b/site/public/about/disclaimer/index.html
deleted file mode 100644
index 28588708..00000000
--- a/site/public/about/disclaimer/index.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>MegaPixels</title>
-  <meta charset="utf-8" />
-  <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="MegaPixels Disclaimer" />
-  <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="/about/">About</a>
-    </div>
-  </header>
-  <div class="content content-about">
-    
-  <section><h1>Disclaimer</h1>
-<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><p>(TEMPORARY PAGE)</p>
-<p>Last updated: December 04, 2018</p>
-<p>The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only.</p>
-<p>MegaPixels.cc assumes no responsibility for errors or omissions in the contents on the Service.</p>
-<p>In no event shall MegaPixels.cc be liable for any special, direct, indirect, consequential, or incidental damages or any damages whatsoever, whether in an action of contract, negligence or other tort, arising out of or in connection with the use of the Service or the contents of the Service. MegaPixels.cc reserves the right to make additions, deletions, or modification to the contents on the Service at any time without prior notice.</p>
-<h2>External links disclaimer</h2>
-<p>MegaPixels.cc website may contain links to external websites that are not provided or maintained by or in any way affiliated with MegaPixels.cc</p>
-<p>Please note that the MegaPixels.cc does not guarantee the accuracy, relevance, timeliness, or completeness of any information on these external websites.</p>
-</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 18ad797a..d228b830 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -30,10 +30,8 @@
 <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/terms/">Terms</a></li>
-<li><a href="/about/privacy/">Privacy</a></li>
+<li><a href="/about/legal/">Legal / 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>
@@ -79,11 +77,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</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
new file mode 100644
index 00000000..d5f384ab
--- /dev/null
+++ b/site/public/about/legal/index.html
@@ -0,0 +1,86 @@
+<!doctype html>
+<html>
+<head>
+  <title>MegaPixels</title>
+  <meta charset="utf-8" />
+  <meta name="author" content="Adam Harvey" />
+  <meta name="description" content="MegaPixels Privacy Policy" />
+  <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="/about/">About</a>
+    </div>
+  </header>
+  <div class="content content-about">
+    
+  <section><h1>Legal</h1>
+<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/legal/">Legal / 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>
+<h3>Changes</h3>
+<p>We reserve the right, at our sole discretion, to modify or replace these Terms at any time. If a revision is material we will try to provide at least 30 days notice prior to any new terms taking effect. What constitutes a material change will be determined at our sole discretion.</p>
+<p>By continuing to access or use our Service after those revisions become effective, you agree to be bound by the revised terms. If you do not agree to the new terms, please stop using the Service.</p>
+<h2>Privacy</h2>
+<p>The MegaPixels site has been designed to minimize the amount of network requests to 3rd party services and therefore prioritize the privacy of the viewer by only loading local dependencies. Additionaly, this site does not use any anaytics programs to monitor site viewers. In fact, the only data collected are the necessary server logs that used only for preventing misuse, which are deleteted at regular short-term intervals.</p>
+<h2>3rd Party Services</h2>
+<p>In order to provide certain features of the site, some 3rd party services are needed. Currently, the MegaPixels.cc site uses two 3rd party services: (1) Leaflet.js for the interactive map and (2 Digital Ocean Spaces as a condent delivery network. Both services encrypt your requests to their server using HTTPS and neither service requires storing any cookies or authentication. However, both services will store files in your web browser's local cache (local storage) to improve loading performance. None of these local storage files are using for analytics, cookie-like technologies, tracking, or any similar purpose.</p>
+<h3>Links To Other Web Sites</h3>
+<p>The MegaPixels.cc contains many links to 3rd party websites, especically in the list of citations that are provided for each dataset. This website has no control over and assumes no responsibility for, the content, privacy policies, or practices of any third party web sites or services. You further acknowledge and agree that megapixels.cc shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such web sites or services.</p>
+<p>We advise you to read the terms and conditions and privacy policies of any third-party web sites or services that you visit.</p>
+<h3>The Information We Provide</h3>
+<p>While every intention is made to verify and publish only verifiablenformation, at times amendments to accuracy may be required. In no event will the operators of this site be liable for your use or misuse of the information provided.</p>
+<p>We may terminate or suspend access to our Service immediately, without prior notice or liability, for any reason whatsoever, including without limitation if you breach the Terms.</p>
+<p>All provisions of the Terms which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.</p>
+<h3>Prohibited Uses</h3>
+<p>You may not access or use, or attempt to access or use, the Services to take any action that could harm us or a third party. You may not use the Services in violation of applicable laws or in violation of our or any third party’s intellectual property or other proprietary or legal rights. You further agree that you shall not attempt (or encourage or support anyone else's attempt) to circumvent, reverse engineer, decrypt, or otherwise alter or interfere with the Services, or any content thereof, or make any unauthorized use thereof.</p>
+<p>Without prior written consent, you shall not:</p>
+<p>(i) access any part of the Services, Content, data or information you do not have permission or authorization to access;</p>
+<p>(ii) use robots, spiders, scripts, service, software or any manual or automatic device, tool, or process designed to data mine or scrape the Content, data or information from the Services, or otherwise access or collect the Content, data or information from the Services using automated means;</p>
+<p>(iii) use services, software or any manual or automatic device, tool, or process designed to circumvent any restriction, condition, or technological measure that controls access to the Services in any way, including overriding any security feature or bypassing or circumventing any access controls or use limits of the Services;</p>
+<p>(iv) cache or archive the Content (except for a public search engine’s use of spiders for creating search indices);</p>
+<p>(v) take action that imposes an unreasonable or disproportionately large load on our network or infrastructure; and</p>
+<p>(vi) do anything that could disable, damage or change the functioning or appearance of the Services, including the presentation of advertising.</p>
+<p>Engaging in a prohibited use of the Services may result in civil, criminal, and/or administrative penalties, fines, or sanctions against the user and those assisting the user.</p>
+<h3>Governing Law</h3>
+<p>These Terms shall be governed and construed in accordance with the laws of Berlin, Germany, without regard to its conflict of law provisions.</p>
+<p>Our failure to enforce any right or provision of these Terms will not be considered a waiver of those rights. If any provision of these Terms is held to be invalid or unenforceable by a court, the remaining provisions of these Terms will remain in effect. These Terms constitute the entire agreement between us regarding our Service, and supersede and replace any prior agreements we might have between us regarding the Service.</p>
+<h3>Indemnity</h3>
+<p>You hereby indemnify, defend and hold harmless MegaPixels (and its creators) and all officers, directors, owners, agents, information providers, affiliates, licensors and licensees (collectively, the "Indemnified Parties") from and against any and all liability and costs, including, without limitation, reasonable attorneys' fees, incurred by the Indemnified Parties in connection with any claim arising out of any breach by you or any user of your account of these Terms of Service or the foregoing representations, warranties and covenants. You shall cooperate as fully as reasonably required in the defense of any such claim. We reserves the right, at its own expense, to assume the exclusive defense and control of any matter subject to indemnification by you.</p>
+</section>
+
+  </div>
+  <footer>
+    <div>
+      <a href="/">MegaPixels.cc</a>
+      <a href="/datasets/">Datasets</a>
+      <a href="/about/">About</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</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/press/index.html b/site/public/about/press/index.html
index 3fc33969..6dc6faa4 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -30,13 +30,10 @@
 <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/terms/">Terms</a></li>
-<li><a href="/about/privacy/">Privacy</a></li>
+<li><a href="/about/legal/">Legal / Privacy</a></li>
 </ul>
-</section><p>(TEMPORARY PAGE)</p>
-<ul>
+</section><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>
@@ -45,11 +42,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html
index 2e1b3349..6e760cf7 100644
--- a/site/public/about/privacy/index.html
+++ b/site/public/about/privacy/index.html
@@ -35,90 +35,15 @@
 <li><a href="/about/terms/">Terms</a></li>
 <li><a class="current" href="/about/privacy/">Privacy</a></li>
 </ul>
-</section><p>(TEMPORARY PAGE)</p>
-<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>
-<p><strong>This is a boilerplate Privacy policy from <a href="https://termsfeed.com/">https://termsfeed.com/</a></strong></p>
-<p><strong>Needs to be reviewed</strong></p>
-<p>Effective date: December 04, 2018</p>
-<p>megapixels.cc ("us", "we", or "our") operates the WebsiteName website (hereinafter referred to as the "Service").</p>
-<p>This page informs you of our policies regarding the collection, use, and disclosure of personal data when you use our Service and the choices you have associated with that data.</p>
-<p>We use your data to provide and improve the Service. By using the Service, you agree to the collection and use of information in accordance with this policy. Unless otherwise defined in this Privacy Policy, the terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, accessible from WebsiteName</p>
-<h2>Definitions</h2>
-<p><strong>Service</strong></p>
-<p>Service is the MegaPixels website operated by megapixels.cc</p>
-<p><strong>Personal Data</strong></p>
-<p>Personal Data means data about a living individual who can be identified from those data (or from those and other information either in our possession or likely to come into our possession).</p>
-<p><strong>Usage Data</strong></p>
-<p>Usage Data is data collected automatically either generated by the use of the Service or from the Service infrastructure itself</p>
-<h2>Information Collection and Use</h2>
-<p>We collect several different types of information for various purposes to provide and improve our Service to you.</p>
-<h2>Types of Data Collected</h2>
-<h3>Personal Data</h3>
-<p>While using our Service, we may ask you to provide us with certain personally identifiable information that can be used to contact or identify you ("Personal Data"). Personally identifiable information may include, but is not limited to:</p>
-<ul>
-<li>Cookies and Usage Data</li>
-</ul>
-<h3>Usage Data</h3>
-<p>We may also collect information how the Service is accessed and used ("Usage Data"). This Usage Data may include information such as your computer's Internet Protocol address (e.g. IP address), browser type, browser version, the pages of our Service that you visit, the time and date of your visit, the time spent on those pages, unique device identifiers and other diagnostic data.</p>
-<h3>Tracking &amp; Cookies Data</h3>
-<p>We use cookies and similar tracking technologies to track the activity on our Service and we hold certain information.
-Cookies are files with a small amount of data which may include an anonymous unique identifier. Cookies are sent to your browser from a website and stored on your device. Other tracking technologies are also used such as beacons, tags and scripts to collect and track information and to improve and analyse our Service.</p>
-<p>You can instruct your browser to refuse all cookies or to indicate when a cookie is being sent. However, if you do not accept cookies, you may not be able to use some portions of our Service.
-Examples of Cookies we use:</p>
-<ul>
-<li><strong>Session Cookies.</strong> We use Session Cookies to operate our Service.</li>
-<li><strong>Preference Cookies.</strong> We use Preference Cookies to remember your preferences and various settings.</li>
-<li><strong>Security Cookies.</strong> We use Security Cookies for security purposes.</li>
-</ul>
-<h2>Use of Data</h2>
-<p>megapixels.cc uses the collected data for various purposes:</p>
-<ul>
-<li>To provide and maintain the Service</li>
-<li>To notify you about changes to our Service</li>
-<li>To allow you to participate in interactive features of our Service when you choose to do so</li>
-<li>To provide customer care and support</li>
-<li>To provide analysis or valuable information so that we can improve the Service</li>
-<li>To monitor the usage of the Service</li>
-<li>To detect, prevent and address technical issues</li>
-</ul>
-<h2>Transfer Of Data</h2>
-<p>Your information, including Personal Data, may be transferred to — and maintained on — computers located outside of your state, province, country or other governmental jurisdiction where the data protection laws may differ than those from your jurisdiction.</p>
-<p>If you are located outside Germany and choose to provide information to us, please note that we transfer the data, including Personal Data, to Germany and process it there.
-Your consent to this Privacy Policy followed by your submission of such information represents your agreement to that transfer.
-megapixels.cc will take all steps reasonably necessary to ensure that your data is treated securely and in accordance with this Privacy Policy and no transfer of your Personal Data will take place to an organization or a country unless there are adequate controls in place including the security of your data and other personal information.</p>
-<h2>Disclosure Of Data</h2>
-<h3>Legal Requirements</h3>
-<p>megapixels.cc may disclose your Personal Data in the good faith belief that such action is necessary to:</p>
-<ul>
-<li>To comply with a legal obligation</li>
-<li>To protect and defend the rights or property of megapixels.cc</li>
-<li>To prevent or investigate possible wrongdoing in connection with the Service</li>
-<li>To protect the personal safety of users of the Service or the public</li>
-<li>To protect against legal liability</li>
-</ul>
-<h2>Security of Data</h2>
-<p>The security of your data is important to us but remember that no method of transmission over the Internet or method of electronic storage is 100% secure. While we strive to use commercially acceptable means to protect your Personal Data, we cannot guarantee its absolute security.</p>
-<h2>Service Providers</h2>
-<p>We may employ third party companies and individuals to facilitate our Service ("Service Providers"), to provide the Service on our behalf, to perform Service-related services or to assist us in analyzing how our Service is used.</p>
-<p>These third parties have access to your Personal Data only to perform these tasks on our behalf and are obligated not to disclose or use it for any other purpose.</p>
-<h2>Links to Other Sites</h2>
-<p>Our Service may contain links to other sites that are not operated by us. If you click a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
-We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.</p>
-<h2>Children's Privacy</h2>
-<p>Our Service does not address anyone under the age of 18 ("Children").</p>
-<p>We do not knowingly collect personally identifiable information from anyone under the age of 18. If you are a parent or guardian and you are aware that your Child has provided us with Personal Data, please contact us. If we become aware that we have collected Personal Data from children without verification of parental consent, we take steps to remove that information from our servers.</p>
-<h2>Changes to This Privacy Policy</h2>
-<p>We may update our Privacy Policy from time to time. We will notify you of any changes by posting the new Privacy Policy on this page.
-We will let you know via email and/or a prominent notice on our Service, prior to the change becoming effective and update the "effective date" at the top of this Privacy Policy.
-You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page.</p>
-<h2>Contact Us</h2>
-<p>If you have any questions about this Privacy Policy, please contact us:</p>
-<ul>
-<li>By visiting this page on our website: <a href="https://megapixels.cc/contact">https://megapixels.cc/contact</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 this site you agree to the terms and conditions set forth below.</p>
+<h2>Privacy</h2>
+<p>The MegaPixels site has been designed to minimize the amount of network requests to 3rd party services and therefore prioritize the privacy of the viewer by only loading local dependencies. Additionaly, this site does not use any anaytics programs to monitor site viewers. In fact, the only data collected are the necessary server logs that used only for preventing misuse, which are deleteted at regular short-term intervals.</p>
+<h2>3rd Party Services</h2>
+<p>In order to provide certain features of the site, some 3rd party services are needed. Currently, the MegaPixels.cc site uses two 3rd party services: (1) Leaflet.js for the interactive map and (2 Digital Ocean Spaces as a condent delivery network. Both services encrypt your requests to their server using HTTPS and neither service requires storing any cookies or authentication. However, both services will store files in your web browser's local cache (local storage) to improve loading performance. None of these local storage files are using for analytics, cookie-like technologies, tracking, or any similar purpose.</p>
+<h3>Links To Other Web Sites</h3>
+<p>The MegaPixels.cc contains many links to 3rd party websites, especically in the list of citations that are provided for each dataset. This website has no control over and assumes no responsibility for, the content, privacy policies, or practices of any third party web sites or services. You further acknowledge and agree that megapixels.cc shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such web sites or services.</p>
+<p>We advise you to read the terms and conditions and privacy policies of any third-party web sites or services that you visit.</p>
 </section>
 
   </div>
diff --git a/site/public/about/research/index.html b/site/public/about/research/index.html
deleted file mode 100644
index 5ad30e20..00000000
--- a/site/public/about/research/index.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>MegaPixels</title>
-  <meta charset="utf-8" />
-  <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="About MegaPixels Research Methodologies" />
-  <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="/about/">About</a>
-    </div>
-  </header>
-  <div class="content content-about">
-    
-  <section><h1>Research Methodologies</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/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>
-    <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/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index 540e2d0d..5f5e35c2 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -45,7 +45,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how 50 People One Question Dataset has been used around the world for commercial, military and academic research; publicly available research citing 50 People One Question is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how 50 People One Question Dataset has been used around the world by commercial, military and academic organizations; publicly available research citing 50 People One Question is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -60,8 +60,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -93,11 +93,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/afad/index.html b/site/public/datasets/afad/index.html
index a0aea1a6..be9e6344 100644
--- a/site/public/datasets/afad/index.html
+++ b/site/public/datasets/afad/index.html
@@ -44,11 +44,10 @@ Motivation</p>
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/aflw/index.html b/site/public/datasets/aflw/index.html
index 7aaa9af0..28cc93b7 100644
--- a/site/public/datasets/aflw/index.html
+++ b/site/public/datasets/aflw/index.html
@@ -37,11 +37,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index 5e8f3a4c..48f0fa0e 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -60,7 +60,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how Brainwash Dataset has been used around the world for commercial, military and academic research; publicly available research citing Brainwash Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how Brainwash Dataset has been used around the world by commercial, military and academic organizations; publicly available research citing Brainwash Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -75,8 +75,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -122,11 +122,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index f1ee0c22..bd423751 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -45,7 +45,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how CelebA Dataset has been used around the world for commercial, military and academic research; publicly available research citing Large-scale CelebFaces Attributes Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how CelebA Dataset has been used around the world by commercial, military and academic organizations; publicly available research citing Large-scale CelebFaces Attributes Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -60,8 +60,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -99,11 +99,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 1f5aa315..3c15fc3c 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -55,7 +55,7 @@ To increase the number of training images, and since  COFW has the exact same la
 	</div>
 	 -->
 	<p>
-		To help understand how COFW Dataset has been used around the world for commercial, military and academic research; publicly available research citing Caltech Occluded Faces in the Wild is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how COFW Dataset has been used around the world by commercial, military and academic organizations; publicly available research citing Caltech Occluded Faces in the Wild is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -70,8 +70,8 @@ To increase the number of training images, and since  COFW has the exact same la
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -118,11 +118,10 @@ To increase the number of training images, and since  COFW has the exact same la
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index 83050506..f2ea2e97 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -48,7 +48,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how Duke MTMC Dataset has been used around the world for commercial, military and academic research; publicly available research citing Duke Multi-Target, Multi-Camera Tracking Project is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how Duke MTMC Dataset has been used around the world by commercial, military and academic organizations; publicly available research citing Duke Multi-Target, Multi-Camera Tracking Project is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -63,8 +63,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
diff --git a/site/public/datasets/facebook/index.html b/site/public/datasets/facebook/index.html
index 7fb1901a..c9f89e4f 100644
--- a/site/public/datasets/facebook/index.html
+++ b/site/public/datasets/facebook/index.html
@@ -38,11 +38,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/feret/index.html b/site/public/datasets/feret/index.html
index ce60f3de..914d7212 100644
--- a/site/public/datasets/feret/index.html
+++ b/site/public/datasets/feret/index.html
@@ -50,11 +50,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index 528d1c3d..9f56d7c7 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -57,7 +57,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how HRT Transgender has been used around the world for commercial, military and academic research; publicly available research citing HRT Transgender Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how HRT Transgender has been used around the world by commercial, military and academic organizations; publicly available research citing HRT Transgender Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -72,8 +72,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -105,11 +105,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html
index 3a2dbd52..7aabc840 100644
--- a/site/public/datasets/index.html
+++ b/site/public/datasets/index.html
@@ -61,18 +61,6 @@
         </div>
       </a>
     
-      <a href="/datasets/lfw/" style="background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/lfw/assets/index.jpg)">
-        <div class="dataset">
-          <span class='title'>Labeled Faces in The Wild</span>
-          <div class='fields'>
-            <div class='year visible'><span>2007</span></div>
-            <div class='purpose'><span>face recognition</span></div>
-            <div class='images'><span>13,233  images</span></div>
-            <div class='identities'><span>5,749 </span></div>
-          </div>
-        </div>
-      </a>
-    
       <a href="/datasets/market_1501/" style="background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/market_1501/assets/index.jpg)">
         <div class="dataset">
           <span class='title'>Market-1501</span>
@@ -97,18 +85,6 @@
         </div>
       </a>
     
-      <a href="/datasets/pipa/" style="background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/pipa/assets/index.jpg)">
-        <div class="dataset">
-          <span class='title'>People in Photo Albums</span>
-          <div class='fields'>
-            <div class='year visible'><span>2015</span></div>
-            <div class='purpose'><span>Face recognition</span></div>
-            <div class='images'><span>37,107  images</span></div>
-            <div class='identities'><span>2,356 </span></div>
-          </div>
-        </div>
-      </a>
-    
       <a href="/datasets/uccs/" style="background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/index.jpg)">
         <div class="dataset">
           <span class='title'>Unconstrained College Students</span>
@@ -141,11 +117,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/lfpw/index.html b/site/public/datasets/lfpw/index.html
index 087d8b1d..1aad66ac 100644
--- a/site/public/datasets/lfpw/index.html
+++ b/site/public/datasets/lfpw/index.html
@@ -40,11 +40,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index 5f076fc7..e6f93335 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -58,7 +58,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how LFW has been used around the world for commercial, military and academic research; publicly available research citing Labeled Faces in the Wild is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how LFW has been used around the world by commercial, military and academic organizations; publicly available research citing Labeled Faces in the Wild is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -73,8 +73,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -127,11 +127,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index 951646e3..ea38bcd7 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -43,7 +43,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how Market 1501 has been used around the world for commercial, military and academic research; publicly available research citing Market 1501 Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how Market 1501 has been used around the world by commercial, military and academic organizations; publicly available research citing Market 1501 Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -58,8 +58,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -106,11 +106,10 @@ organization={Springer}
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/mars/index.html b/site/public/datasets/mars/index.html
deleted file mode 100644
index b053b456..00000000
--- a/site/public/datasets/mars/index.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>MegaPixels</title>
-  <meta charset="utf-8" />
-  <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="Motion Analysis and Re-identification Set (MARS) is a dataset is collection of CCTV footage " />
-  <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="/about/">About</a>
-    </div>
-  </header>
-  <div class="content content-dataset">
-    
-  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/mars/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span style="color:#99ccee">Motion Analysis and Re-identification Set (MARS)</span> is a dataset is collection of CCTV footage </span></div><div class='hero_subdesc'><span class='bgpad'>The MARS dataset includes 1,191,003 of people used for training person re-identification algorithms
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>Motion Analysis and Re-identification Set (MARS)</h2>
-<p>(PAGE UNDER DEVELOPMENT)</p>
-<p>At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.</p>
-<p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
-</section><section>
-	
-	<h3>Biometric Trade Routes (beta)</h3>
-<!-- 
-	<div class="map-sidebar right-sidebar">
-	  <h3>Legend</h3>
-	  <ul>
-	    <li><span style="color: #f2f293">&#9632;</span> Industry</li>
-	    <li><span style="color: #f30000">&#9632;</span> Academic</li>
-	    <li><span style="color: #3264f6">&#9632;</span> Government</li>
-	  </ul>
-	</div>
-	 -->
-	<p>
-		To understand how MARS has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the  and where this dataset has been used the locations of each organization that used or referenced the datast 
-	</p>
- 
- </section>
-
-<section class="applet_container">
- <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
-</section>
-
-<div class="caption">
-	<div class="map-legend-item edu">Academic</div>
-	<div class="map-legend-item com">Industry</div>
-	<div class="map-legend-item gov">Government</div> 
-	Data is compiled from <a href="https://www.semanticscholar.org">Semantic Scholar</a> and not yet manually verified.
-</div>
-
-<section>
-	<p class='subp'>
-		The data is generated by collecting all citations for all  original research papers associated with the dataset. Then the PDFs are then converted to text and the organization names are extracted and geocoded. Because of the automated approach to extracting data, actual use of the dataset can not yet be confirmed. This visualization is provided to help locate and confirm usage and will be updated as data noise is reduced.
-	</p>
-</section><section>
-
-
-  <div class="hr-wave-holder">
-      <div class="hr-wave-line hr-wave-line1"></div>
-      <div class="hr-wave-line hr-wave-line2"></div>
-  </div>
-
-  <h2>Supplementary Information</h2>
-</section><section class="applet_container">
-
-  <h3>Citations</h3>
-  <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  Metadata was extracted from these papers, including extracting names of institutions automatically from PDFs, and then the addresses were geocoded.  Data is not yet manually verified, and reflects anytime the paper was cited.  Some papers may only mention the dataset in passing, while others use it as part of their research methodology.
-  </p>
-  <p>
-    Add button/link to download CSV
-  </p>
-
-  <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></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/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index 9a671c8e..9ae09ca0 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -60,7 +60,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how MsCeleb has been used around the world for commercial, military and academic research; publicly available research citing Microsoft Celebrity Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how MsCeleb has been used around the world by commercial, military and academic organizations; publicly available research citing Microsoft Celebrity Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -75,8 +75,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -116,11 +116,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index fe6a4742..4a820410 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -43,7 +43,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how PIPA Dataset has been used around the world for commercial, military and academic research; publicly available research citing People in Photo Albums Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how PIPA Dataset has been used around the world by commercial, military and academic organizations; publicly available research citing People in Photo Albums Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -58,8 +58,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index 10b7603e..8cb00d7c 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -4,7 +4,7 @@
   <title>MegaPixels</title>
   <meta charset="utf-8" />
   <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="Unconstrained College Students (UCCS) is a dataset of long-range surveillance photos of students taken without their knowledge" />
+  <meta name="description" content="Unconstrained College Students (UCCS) is a dataset of long-range surveillance photos of students at University of Colorado" />
   <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' />
@@ -26,10 +26,56 @@
   </header>
   <div class="content content-dataset">
     
-  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of long-range surveillance photos of students taken without their knowledge</span></div><div class='hero_subdesc'><span class='bgpad'>The UCCS dataset includes 16,149 images and 1,732 identities of students at University of Colorado Colorado Springs campus and is used for face recognition and face detection
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2018</div></div><div><div class='gray'>Images</div><div>16,149</div></div><div><div class='gray'>Identities</div><div>1,732</div></div><div><div class='gray'>Used for</div><div>Face recognition, face detection</div></div><div><div class='gray'>Created by</div><div>Unviversity of Colorado Colorado Springs (US)</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, ONR MURI, Amry SBIR, SOCOM SBIR</div></div><div><div class='gray'>Website</div><div><a href="https://vast.uccs.edu/Opensetface/">vast.uccs.edu</a></div></div></div></div><h2>Unconstrained College Students ...</h2>
-<p>(PAGE UNDER DEVELOPMENT)</p>
-</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/uccs_mean_bboxes_comp.jpg' alt=' The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey'><div class='caption'> The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey</div></div></section><section>
+  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of long-range surveillance photos of students at University of Colorado</span></div><div class='hero_subdesc'><span class='bgpad'>The UCCS dataset includes 16,149 images and 1,732 identities of subjects on University of Colorado Colorado Springs campus and is used for face recognition and face detection
+</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2018</div></div><div><div class='gray'>Images</div><div>16,149</div></div><div><div class='gray'>Identities</div><div>1,732</div></div><div><div class='gray'>Used for</div><div>Face recognition, face detection</div></div><div><div class='gray'>Created by</div><div>Unviversity of Colorado Colorado Springs (US)</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, ONR MURI, Amry SBIR, SOCOM SBIR</div></div><div><div class='gray'>Website</div><div><a href="https://vast.uccs.edu/Opensetface/">vast.uccs.edu</a></div></div></div></div><h2>Unconstrained College Students (UCCS)</h2>
+<p>Unconstrained College Students (UCCS) is a dataset of long-range surveillance photos captured at University of Colorado Colorado Springs. According to the authors of two papers associated with the dataset, subjects were "photographed using a long-range high-resolution surveillance camera without their knowledge" <a class="footnote_shim" name="[^funding_uccs]_1"> </a><a href="#[^funding_uccs]" class="footnote" title="Footnote 2">2</a>. The images were captured using a Canon 7D digital camera fitted with a Sigma 800mm telephoto lens pointed out the window of an office aimed at students walking to and from classes.</p>
+<p>The UCCS dataset was funded by ODNI (Office of Director of National Intelligence), IARPA (Intelligence Advance Research Projects Activity), ONR MURI (Office of Naval Research and The Department of Defense Multidisciplinary University Research Initiative), Army SBIR (Small Business Innovation Research), SOCOM SBIR (Special Operations Command and Small Business Innovation Research), and the National Science Foundation. <a class="footnote_shim" name="[^funding_sb]_1"> </a><a href="#[^funding_sb]" class="footnote" title="Footnote 1">1</a> <a class="footnote_shim" name="[^funding_uccs]_2"> </a><a href="#[^funding_uccs]" class="footnote" title="Footnote 2">2</a></p>
+<p>The images in UCCS were taken on 19 non-consecutive days during 2012 - 2013 and include a variety of weather and clothing variation. The embedded <a href="assets/uccs_camera_exif.csv">EXIF data</a> in the images reveals that the images were taken on the following dates:</p>
+</section><section><div class='columns columns-2'><div class='column'><h4>UCCS photos taken in 2012</h4>
+<table>
+<thead><tr>
+<th>Date</th>
+<th>Photos</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Feb 23, 2014</td>
+<td>132</td>
+</tr>
+<tr>
+<td>March 6, 2014</td>
+<td>-</td>
+</tr>
+<tr>
+<td>March 8, 2014</td>
+<td>-</td>
+</tr>
+</tbody>
+</table>
+</div><div class='column'><h4>UCCS photos taken in 2013</h4>
+<table>
+<thead><tr>
+<th>Date</th>
+<th>Photos</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Feb 23, 2014</td>
+<td>132</td>
+</tr>
+<tr>
+<td>March 6, 2014</td>
+<td>-</td>
+</tr>
+<tr>
+<td>March 8, 2014</td>
+<td>-</td>
+</tr>
+</tbody>
+</table>
+</div></div></section><section>
 	
 	<h3>Biometric Trade Routes</h3>
 <!-- 
@@ -43,7 +89,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how UCCS has been used around the world for commercial, military and academic research; publicly available research citing UnConstrained College Students Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how UCCS has been used around the world by commercial, military and academic organizations; publicly available research citing UnConstrained College Students Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -58,8 +104,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -82,6 +128,17 @@
  <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
 </section><section class="applet_container">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
+</section><section class="applet_container">
+
+  <h3>Dataset Citations</h3>
+  <p>
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
+  </p>
+
+  <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
+</section><section><h2>Opting Out</h2>
+<p>If you attended University of Colorado Colorado Springs and were captured by the long range surveillance camera used to create this dataset, there is unfortunatley no way to be removed. The authors do not provide any option for students to opt-out nor were any students informed they would be used for training face recognition. According to the authors, the lack of any consent is what provides part of the value of the Unconstrained College Students Dataset.</p>
+<p>More information and contact emails are provided on the UCCS dataset site: <a href="https://vast.uccs.edu/Opensetface/">https://vast.uccs.edu/Opensetface/</a></p>
 </section><section>
 
 
@@ -92,49 +149,34 @@
 
   <h3>Supplementary Information</h3>
   
-</section><section class="applet_container">
-
-  <h3>Dataset Citations</h3>
-  <p>
-    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
-  </p>
-
-  <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
-</section><section><h3>Research Notes</h3>
-<p>The original Sapkota and Boult dataset, from which UCCS is derived, received funding from<sup class="footnote-ref" id="fnref-funding_sb"><a href="#fn-funding_sb">1</a></sup>:</p>
+</section><section><h4>Data Visualizations</h4>
+</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/uccs_mean_bboxes_comp.jpg' alt=' The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey'><div class='caption'> The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey</div></div></section><section><h4>Funding</h4>
+<p>As mentioned above, Unconstrained College Students dataset is associated with two main research papers: "Large Scale Unconstrained Open Set Face Database" and "Unconstrained Face Detection and Open-Set Face Recognition Challenge". Collective these papers, and the creation of the dataset have received funding from the following organizations:</p>
 <ul>
 <li>ONR (Office of Naval Research) MURI (The Department of Defense Multidisciplinary University Research Initiative) grant N00014-08-1-0638</li>
 <li>Army SBIR (Small Business Innovation Research) grant W15P7T-12-C-A210</li>
 <li>SOCOM (Special Operations Command) SBIR (Small Business Innovation Research) grant H92222-07-P-0020</li>
-</ul>
-<p>The more recent UCCS version of the dataset received funding from <sup class="footnote-ref" id="fnref-funding_uccs"><a href="#fn-funding_uccs">2</a></sup>:</p>
-<ul>
 <li>National Science Foundation Grant IIS-1320956</li>
 <li>ODNI (Office of Director of National Intelligence)</li>
 <li>IARPA (Intelligence Advance Research Projects Activity) R&amp;D contract 2014-14071600012</li>
 </ul>
-<p>" In most face detection/recognition datasets, the majority of images are “posed”, i.e. the subjects know they are being photographed, and/or the images are selected for publication in public media. Hence, blurry, occluded and badly illuminated images are generally uncommon in these datasets. In addition, most of these challenges are close-set, i.e. the list of subjects in the gallery is the same as the one used for testing.</p>
-<p>This challenge explores more unconstrained data, by introducing the new UnConstrained College Students (UCCS) dataset, where subjects are photographed using a long-range high-resolution surveillance camera without their knowledge. Faces inside these images are of various poses, and varied levels of blurriness and occlusion. The challenge also creates an open set recognition problem, where unknown people will be seen during testing and must be rejected.</p>
-<p>With this challenge, we hope to foster face detection and recognition research towards surveillance applications that are becoming more popular and more required nowadays, and where no automatic recognition algorithm has proven to be useful yet.</p>
-<p>UnConstrained College Students (UCCS) Dataset</p>
-<p>The UCCS dataset was collected over several months using Canon 7D camera fitted with Sigma 800mm F5.6 EX APO DG HSM lens, taking images at one frame per second, during times when many students were walking on the sidewalk. "</p>
-<div class="footnotes">
-<hr>
-<ol><li id="fn-funding_sb"><p>Sapkota, Archana and Boult, Terrance. "Large Scale Unconstrained Open Set Face Database." 2013.<a href="#fnref-funding_sb" class="footnote">&#8617;</a></p></li>
-<li id="fn-funding_uccs"><p>Günther, M. et. al. "Unconstrained Face Detection and Open-Set Face Recognition Challenge," 2018. Arxiv 1708.02337v3.<a href="#fnref-funding_uccs" class="footnote">&#8617;</a></p></li>
-</ol>
-</div>
-</section>
+<h4>TODO</h4>
+<ul>
+<li>parse dates into CSV using Python</li>
+<li>get google image showing line of sight?</li>
+</ul>
+</section><section><ul class="footnotes"><li><a name="[^funding_sb]" class="footnote_shim"></a><span class="backlinks"><a href="#[^funding_sb]_1">a</a></span><p>Sapkota, Archana and Boult, Terrance. "Large Scale Unconstrained Open Set Face Database." 2013.</p>
+</li><li><a name="[^funding_uccs]" class="footnote_shim"></a><span class="backlinks"><a href="#[^funding_uccs]_1">a</a><a href="#[^funding_uccs]_2">b</a></span><p>Günther, M. et. al. "Unconstrained Face Detection and Open-Set Face Recognition Challenge," 2018. Arxiv 1708.02337v3.</p>
+</li></ul></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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/vgg_face2/index.html b/site/public/datasets/vgg_face2/index.html
index 42e3b961..4dd34113 100644
--- a/site/public/datasets/vgg_face2/index.html
+++ b/site/public/datasets/vgg_face2/index.html
@@ -56,11 +56,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index cc4272c8..d3365c86 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -60,7 +60,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how VIPeR has been used around the world for commercial, military and academic research; publicly available research citing Viewpoint Invariant Pedestrian Recognition is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how VIPeR has been used around the world by commercial, military and academic organizations; publicly available research citing Viewpoint Invariant Pedestrian Recognition is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
 	</p>
  
  </section>
@@ -75,8 +75,8 @@
 	<li class="edu">Academic</li>
 	<li class="com">Commercial</li>
 	<li class="gov">Military / Government</li>
-	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
+	<div class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -108,11 +108,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/datasets/youtube_celebrities/index.html b/site/public/datasets/youtube_celebrities/index.html
index dd230926..407fad28 100644
--- a/site/public/datasets/youtube_celebrities/index.html
+++ b/site/public/datasets/youtube_celebrities/index.html
@@ -47,11 +47,10 @@ the views of our sponsors.</p>
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/test/chart/index.html b/site/public/test/chart/index.html
index 93e12b3c..6081b83c 100644
--- a/site/public/test/chart/index.html
+++ b/site/public/test/chart/index.html
@@ -34,11 +34,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/test/citations/index.html b/site/public/test/citations/index.html
index 70b3fe55..3db2ef45 100644
--- a/site/public/test/citations/index.html
+++ b/site/public/test/citations/index.html
@@ -34,11 +34,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/test/csv/index.html b/site/public/test/csv/index.html
index 70a7d257..92f5bfc4 100644
--- a/site/public/test/csv/index.html
+++ b/site/public/test/csv/index.html
@@ -34,11 +34,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/test/datasets/index.html b/site/public/test/datasets/index.html
index 15edf039..69f2ae4a 100644
--- a/site/public/test/datasets/index.html
+++ b/site/public/test/datasets/index.html
@@ -34,11 +34,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/test/face_search/index.html b/site/public/test/face_search/index.html
index 93dc2bc6..cde962a5 100644
--- a/site/public/test/face_search/index.html
+++ b/site/public/test/face_search/index.html
@@ -34,11 +34,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/test/gallery/index.html b/site/public/test/gallery/index.html
index 9e2c54f6..c358caa7 100644
--- a/site/public/test/gallery/index.html
+++ b/site/public/test/gallery/index.html
@@ -30,17 +30,32 @@
 <h3><a href="/test/">&larr; Back to test index</a></h3>
 </section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/test/assets/man.jpg' alt='Modal image 1'><div class='caption'>Modal image 1</div></div>
 <div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/test/assets/man.jpg' alt='Modal image 2'><div class='caption'>Modal image 2</div></div>
-<div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/test/assets/man.jpg' alt='Modal image 3'><div class='caption'>Modal image 3</div></div></section>
+<div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/test/assets/man.jpg' alt='Modal image 3'><div class='caption'>Modal image 3</div></div></section><section><h2>Test table</h2>
+<table>
+<thead><tr>
+<th>Col1</th>
+<th>Col2</th>
+<th>Col3</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Content1</td>
+<td>Content2</td>
+<td>Content3</td>
+</tr>
+</tbody>
+</table>
+</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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/test/index.html b/site/public/test/index.html
index 0fc839d0..16ced576 100644
--- a/site/public/test/index.html
+++ b/site/public/test/index.html
@@ -45,11 +45,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/test/map/index.html b/site/public/test/map/index.html
index 4f4e7093..07235199 100644
--- a/site/public/test/map/index.html
+++ b/site/public/test/map/index.html
@@ -34,11 +34,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/test/name_search/index.html b/site/public/test/name_search/index.html
index 4e3ef428..76baf912 100644
--- a/site/public/test/name_search/index.html
+++ b/site/public/test/name_search/index.html
@@ -34,11 +34,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/test/pie_chart/index.html b/site/public/test/pie_chart/index.html
index 7dd159a3..9728ecb7 100644
--- a/site/public/test/pie_chart/index.html
+++ b/site/public/test/pie_chart/index.html
@@ -34,11 +34,10 @@
   <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="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
-- 
cgit v1.2.3-70-g09d2


From af41073892c9391d679b8872f498767ef87150d4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 2 Apr 2019 13:10:14 +0200
Subject: incorporate sheet utilities

---
 megapixels/app/settings/app_cfg.py      |  1 +
 megapixels/app/utils/sheet_utils.py     | 82 +++++++++++++++++++++++++++++++++
 site/includes/supplementary_header.html |  1 -
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 megapixels/app/utils/sheet_utils.py

(limited to 'site')

diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py
index f6d0a7df..1eed1a41 100644
--- a/megapixels/app/settings/app_cfg.py
+++ b/megapixels/app/settings/app_cfg.py
@@ -169,6 +169,7 @@ DIR_SITE_INCLUDES = "../site/includes"
 DIR_SITE_USER_CONTENT = "../site/public/user_content"
 DIR_SITE_DATASETS = "../site/datasets/"
 DIR_SITE_FINAL_CITATIONS = "../site/datasets/final/"
+GOOGLE_ACCOUNT_CREDS_PATH = os.path.join("../", os.getenv("GOOGLE_ACCOUNT_CREDS_PATH"))
 
 # -----------------------------------------------------------------------------
 # Celery
diff --git a/megapixels/app/utils/sheet_utils.py b/megapixels/app/utils/sheet_utils.py
new file mode 100644
index 00000000..85f979c6
--- /dev/null
+++ b/megapixels/app/utils/sheet_utils.py
@@ -0,0 +1,82 @@
+import os
+import gspread
+from oauth2client.service_account import ServiceAccountCredentials
+
+from app.settings import app_cfg as cfg
+
+def fetch_spreadsheet():
+  """Open the Google Spreadsheet, which contains the individual worksheets"""
+  scope = ['https://spreadsheets.google.com/feeds', 'https://www.googleapis.com/auth/drive']
+  path = os.path.dirname(os.path.abspath(__file__))
+  credentials = ServiceAccountCredentials.from_json_keyfile_name(cfg.GOOGLE_ACCOUNT_CREDS_PATH, scope)
+  docid = "1denb7TjYsN9igHyvYah7fQ0daABW32Z30lwV7QrDJQc"
+  client = gspread.authorize(credentials)
+  spreadsheet = client.open_by_key(docid)
+  return spreadsheet
+
+def fetch_worksheet(name):
+  """Get a reference to a particular "worksheet" from the Google Spreadsheet"""
+  spreadsheet = fetch_spreadsheet()
+  return spreadsheet.worksheet(name)
+
+def fetch_google_sheet(name):
+  """Get all the values from a particular worksheet as a list of lists.
+  Returns:
+  :keys - the first row of the document
+  :lines - a list of lists with the rest of the rows"""
+  rows = fetch_worksheet(name).get_all_values()
+  keys = rows[0]
+  lines = rows[1:]
+  return keys, lines
+
+def fetch_google_sheet_objects(name):
+  """Get all the values from a worksheet as a list of dictionaries"""
+  keys, rows = fetch_google_sheet(name)
+  recs = []
+  for row in rows:
+    rec = {}
+    for index, key in enumerate(keys):
+      rec[key] = row[index]
+    recs.append(rec)
+  return recs
+
+def fetch_google_lookup(name, item_key='key'):
+  """Get all the values from a worksheet as a dictionary of dictionaries.
+  Specify which field you want to use as the dictionary key."""
+  keys, rows = fetch_google_sheet(name)
+  lookup = {}
+  for row in rows:
+    rec = {}
+    for index, key in enumerate(keys):
+      rec[key] = row[index]
+    lookup[rec[item_key]] = rec
+  return lookup
+
+def fetch_verified_paper_lookup():
+  """Fetch a lookup keyed by dataset, where each dataset points to a hash of valid or invalid papers..."""
+  keys, rows = fetch_google_sheet('verifications')
+  verified_lookup = {}
+  for row in rows:
+    rec = {}
+    for index, key in enumerate(keys):
+      rec[key] = row[index]
+    if rec['dataset'] not in verified_lookup:
+      verified_lookup[rec['dataset']] = {}
+    if str(rec['uses_dataset']) == '1':
+      verified_lookup[rec['dataset']][rec['paper_id']] = rec
+  return verified_lookup
+
+def update_or_append_worksheet(name, form):
+  """Update a row if it exists, create it if it doesn't"""
+  worksheet = fetch_worksheet(name)
+  keys = worksheet.row_values(1)
+  row = [ form[key] if key in form else '' for key in keys ]
+  try:
+    cell = worksheet.find(form['paper_id'])
+  except:
+    cell = None
+  if cell:
+    for i, item in enumerate(row):
+      worksheet.update_cell(cell.row, i+1, item)
+  else:
+    worksheet.append_row(row)
diff --git a/site/includes/supplementary_header.html b/site/includes/supplementary_header.html
index bcd84223..be0967e4 100644
--- a/site/includes/supplementary_header.html
+++ b/site/includes/supplementary_header.html
@@ -1,6 +1,5 @@
 <section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
-- 
cgit v1.2.3-70-g09d2


From b8f5c87e823d0b68d5e30f8de453ba90dcadc241 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 2 Apr 2019 14:38:27 +0200
Subject: sidebar from spreadsheet

---
 megapixels/app/site/loader.py                      | 38 ++++++++++++++++++++++
 megapixels/app/site/parser.py                      | 11 +------
 site/assets/css/css.css                            | 11 +------
 site/content/pages/datasets/brainwash/index.md     | 11 +------
 site/includes/sidebar.html                         |  6 ++++
 .../datasets/50_people_one_question/index.html     |  4 +--
 site/public/datasets/brainwash/index.html          | 24 ++++++++++++--
 site/public/datasets/celeba/index.html             |  4 +--
 site/public/datasets/cofw/index.html               |  4 +--
 site/public/datasets/duke_mtmc/index.html          |  4 +--
 site/public/datasets/facebook/index.html           |  3 +-
 site/public/datasets/hrt_transgender/index.html    |  4 +--
 site/public/datasets/lfw/index.html                |  4 +--
 site/public/datasets/market_1501/index.html        |  4 +--
 site/public/datasets/msceleb/index.html            |  4 +--
 site/public/datasets/pipa/index.html               |  4 +--
 site/public/datasets/uccs/index.html               |  4 +--
 site/public/datasets/viper/index.html              |  4 +--
 site/public/research/index.html                    | 18 ++++++++--
 19 files changed, 109 insertions(+), 57 deletions(-)
 create mode 100644 site/includes/sidebar.html

(limited to 'site')

diff --git a/megapixels/app/site/loader.py b/megapixels/app/site/loader.py
index 779f68ba..701c78b2 100644
--- a/megapixels/app/site/loader.py
+++ b/megapixels/app/site/loader.py
@@ -5,6 +5,9 @@ import glob
 import app.settings.app_cfg as cfg
 
 from app.utils.file_utils import load_json
+import app.utils.sheet_utils as sheet
+
+sidebar = sheet.fetch_google_lookup("sidebar", item_key="key")
 
 def read_metadata(fn):
   """
@@ -20,6 +23,12 @@ def read_metadata(fn):
     sections = data.split("\n\n")
   return parse_metadata(fn, sections)
 
+def domainFromUrl(url):
+  domain = url.split('/')[2].split('.')
+  if len(domain) > 2 and len(domain[-2]) == 2:
+    return ".".join(domain[-3:])
+  return ".".join(domain[-2:])
+
 
 default_metadata = {
   'status': 'published',
@@ -33,6 +42,18 @@ default_metadata = {
   'tagline': '',
 }
 
+sidebar_order = [
+  { 'key': 'published', 'title': 'Published' },
+  { 'key': 'images', 'title': 'Images' },
+  { 'key': 'videos', 'title': 'Videos' },
+  { 'key': 'identities', 'title': 'Identities' },
+  { 'key': 'purpose', 'title': 'Purpose' },
+  { 'key': 'created_by', 'title': 'Created by' },
+  { 'key': 'funded_by_short', 'title': 'Funded by' },
+  { 'key': 'size_gb', 'title': 'Download Size' },
+  { 'key': 'website', 'title': 'Website' },
+]
+
 def parse_metadata(fn, sections):
   """
   parse the metadata headers in a markdown file
@@ -87,8 +108,25 @@ def parse_metadata(fn, sections):
       print("Bad metadata? {}".format(dataset_path))
   elif 'datasets' in fn:
     print("/!\\ {} does not exist!".format(dataset_path))
+
+  if metadata['slug'] in sidebar:
+    sidebar_row = sidebar[metadata['slug']]
+    if sidebar_row:
+      metadata['sidebar'] = []
+      for item in sidebar_order:
+        key = item['key']
+        value = sidebar_row[key]
+        if value:
+          value = value.replace(' - ', ' &ndash; ')
+          if key == 'size_gb':
+            value += ' GB'
+          if key == 'website':
+            value = "<a href='" + value + "' target='_blank' rel='nofollow noopener'>" + domainFromUrl(value) + "</a>"
+          metadata['sidebar'].append({ 'value': value, 'title': item['title'], })
+
   if 'meta' not in metadata or not metadata['meta']: # dude
     metadata['meta'] = {}
+    metadata['sidebar'] = []
 
   return metadata, valid_sections
 
diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py
index 06c45f41..dc2a09f2 100644
--- a/megapixels/app/site/parser.py
+++ b/megapixels/app/site/parser.py
@@ -55,7 +55,7 @@ def parse_markdown(metadata, sections, s3_path, skip_h1=False):
     elif '### statistics' in section.lower() or '### sidebar' in section.lower():
       if len(current_group):
         groups.append(format_section(current_group, s3_path))
-      current_group = []
+      current_group = [format_include("{% include 'sidebar.html' %}", metadata)]
       if 'sidebar' not in section.lower():
         current_group.append(section)
       in_stats = True
@@ -267,15 +267,6 @@ def format_include(section, metadata):
   include_fn = section.strip().strip('\n').strip().strip('{%').strip().strip('%}').strip()
   include_fn = include_fn.strip('include').strip().strip('"').strip().strip("'").strip()
   return includes_env.get_template(include_fn).render(metadata=metadata)
-  # include_dir = cfg.DIR_SITE_INCLUDES
-  # try:
-  #   includes_env.get_template(fp_html)
-  #   with open(join(include_dir, fp_html), 'r') as fp:
-  #     html = fp.read().replace('\n', '')
-  #   return html
-  # except Exception as e:
-  #   print(f'Error parsing include: {e}')
-  #   return ''
 
 def format_applet(section, s3_path):
   """
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 0ee8a4f3..30663ef7 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -1,4 +1,4 @@
-da* { box-sizing: border-box; outline: 0; }
+* { box-sizing: border-box; outline: 0; }
 html, body {
   margin: 0;
   padding: 0;
@@ -278,11 +278,8 @@ p.subp{
   color: #ccc;
   margin-bottom: 20px;
   font-family: 'Roboto', sans-serif;
-}
-.meta > div {
   margin-right: 20px;
   line-height: 17px
-  /*font-size:11px;*/
 }
 .meta .gray {
   font-size: 9pt;
@@ -316,12 +313,6 @@ p.subp{
 .left-sidebar .meta, .right-sidebar .meta {
   flex-direction: column;
 }
-.right-sidebar .meta > div {
-  margin-bottom: 10px;
-}
-.left-sidebar .meta > div {
-  margin-bottom: 15px;
-}
 .right-sidebar ul {
   margin-bottom: 10px;
   color: #aaa;
diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md
index 6d90e78f..db88d949 100644
--- a/site/content/pages/datasets/brainwash/index.md
+++ b/site/content/pages/datasets/brainwash/index.md
@@ -15,16 +15,7 @@ authors: Adam Harvey
 ------------
 
 ### sidebar
-
-+ Published: 2015
-+ Images: 11,918
-+ Faces: 91,146
-+ Created by: Stanford University (US)<br>Max Planck Institute for Informatics (DE)
-+ Funded by: Max Planck Center for Visual Computing and Communication
-+ Purpose: Head detection
-+ Download Size: 4.1GB
-+ Website: <a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">stanford.edu</a>
-
+### end sidebar
 
 ## Brainwash Dataset
 
diff --git a/site/includes/sidebar.html b/site/includes/sidebar.html
new file mode 100644
index 00000000..0f7d2dad
--- /dev/null
+++ b/site/includes/sidebar.html
@@ -0,0 +1,6 @@
+{% for item in metadata.sidebar %}
+  <div class='meta'>
+    <div class='gray'>{{ item.title }}</div>
+    <div>{{ item.value }}</div>
+  </div>
+{% endfor %}
\ No newline at end of file
diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index 540e2d0d..1b03fc7e 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/50_people_one_question/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span style="color:#ffaa00">People One Question</span> is a dataset of people from an online video series on YouTube and Vimeo used for building facial recogntion algorithms</span></div><div class='hero_subdesc'><span class='bgpad'>People One Question dataset includes ...
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>50 People 1 Question</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>50 People 1 Question</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 <p>At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.</p>
 <p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
@@ -71,7 +72,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index 5e8f3a4c..c0830a96 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -27,7 +27,28 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/brainwash/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>Brainwash is a dataset of webcam images taken from the Brainwash Cafe in San Francisco in 2014</span></div><div class='hero_subdesc'><span class='bgpad'>The Brainwash dataset includes 11,918 images of "everyday life of a busy downtown cafe" and is used for training head detection surveillance algorithms
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2015</div></div><div><div class='gray'>Images</div><div>11,918</div></div><div><div class='gray'>Faces</div><div>91,146</div></div><div><div class='gray'>Created by</div><div>Stanford University (US)<br>Max Planck Institute for Informatics (DE)</div></div><div><div class='gray'>Funded by</div><div>Max Planck Center for Visual Computing and Communication</div></div><div><div class='gray'>Purpose</div><div>Head detection</div></div><div><div class='gray'>Download Size</div><div>4.1GB</div></div><div><div class='gray'>Website</div><div><a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">stanford.edu</a></div></div></div></div><h2>Brainwash Dataset</h2>
+</span></div></div></section><section><div class='left-sidebar'><div class='meta'>
+    <div class='gray'>Published</div>
+    <div>2015</div>
+  </div><div class='meta'>
+    <div class='gray'>Images</div>
+    <div>11,917 </div>
+  </div><div class='meta'>
+    <div class='gray'>Purpose</div>
+    <div>Head detection</div>
+  </div><div class='meta'>
+    <div class='gray'>Created by</div>
+    <div>Stanford University (US), Max Planck Institute for Informatics (DE)</div>
+  </div><div class='meta'>
+    <div class='gray'>Funded by</div>
+    <div>Max Planck Center for Visual Computing and Communication</div>
+  </div><div class='meta'>
+    <div class='gray'>Download Size</div>
+    <div>4.1 GB</div>
+  </div><div class='meta'>
+    <div class='gray'>Website</div>
+    <div><a href='https://purl.stanford.edu/sx925dc9385' target='_blank' rel='nofollow noopener'>stanford.edu</a></div>
+  </div></div><h2>Brainwash Dataset</h2>
 <p><em>Brainwash</em> is a head detection dataset created from San Francisco's Brainwash Cafe livecam footage. It includes 11,918 images of "everyday life of a busy downtown cafe"<a class="footnote_shim" name="[^readme]_1"> </a><a href="#[^readme]" class="footnote" title="Footnote 1">1</a> captured at 100 second intervals throught the entire day. Brainwash dataset was captured during 3 days in 2014: October 27, November 13, and November 24. According the author's reserach paper introducing the dataset, the images were acquired with the help of Angelcam.com [cite orig paper].</p>
 <p>Brainwash is not a widely used dataset but since its publication by Stanford University in 2015, it has notably appeared in several research papers from the National University of Defense Technology in Changsha, China. In 2016 and in 2017 researchers there conducted studies on detecting people's heads in crowded scenes for the purpose of surveillance <a class="footnote_shim" name="[^localized_region_context]_1"> </a><a href="#[^localized_region_context]" class="footnote" title="Footnote 2">2</a> <a class="footnote_shim" name="[^replacement_algorithm]_1"> </a><a href="#[^replacement_algorithm]" class="footnote" title="Footnote 3">3</a>.</p>
 <p>If you happen to have been at Brainwash cafe in San Franscisco at any time on October 26, November 13, or November 24 in 2014 you are most likely included in the Brainwash dataset.</p>
@@ -94,7 +115,6 @@
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index f1ee0c22..ef7a3b27 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/celeba/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span style="color:#ffaa00">CelebA</span> is a dataset of people...</span></div><div class='hero_subdesc'><span class='bgpad'>CelebA includes...
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>CelebA</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>CelebA</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 <p>At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.</p>
 <p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
@@ -71,7 +72,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 1f5aa315..3520aaa2 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -26,7 +26,8 @@
   </header>
   <div class="content content-">
     
-  <section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Years</div><div>1993-1996</div></div><div><div class='gray'>Images</div><div>14,126</div></div><div><div class='gray'>Identities</div><div>1,199 </div></div><div><div class='gray'>Origin</div><div>Web Searches</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, Microsoft</div></div></div></div><h2>Caltech Occluded Faces in the Wild</h2>
+  <section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Years</div><div>1993-1996</div></div><div><div class='gray'>Images</div><div>14,126</div></div><div><div class='gray'>Identities</div><div>1,199 </div></div><div><div class='gray'>Origin</div><div>Web Searches</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, Microsoft</div></div></div></div><h2>Caltech Occluded Faces in the Wild</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 <p>COFW is "is designed to benchmark face landmark algorithms in realistic conditions, which include heavy occlusions and large shape variations" [Robust face landmark estimation under occlusion].</p>
 <p>RESEARCH below this line</p>
@@ -81,7 +82,6 @@ To increase the number of training images, and since  COFW has the exact same la
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index 83050506..c3e84053 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/duke_mtmc/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Duke MTMC</span> is a dataset of surveillance camera footage of students on Duke University campus</span></div><div class='hero_subdesc'><span class='bgpad'>Duke MTMC contains over 2 million video frames and 2,000 unique identities collected from 8 HD cameras at Duke University campus in March 2014
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Created</div><div>2014</div></div><div><div class='gray'>Identities</div><div>Over 2,700</div></div><div><div class='gray'>Used for</div><div>Face recognition, person re-identification</div></div><div><div class='gray'>Created by</div><div>Computer Science Department, Duke University, Durham, US</div></div><div><div class='gray'>Website</div><div><a href="http://vision.cs.duke.edu/DukeMTMC/">duke.edu</a></div></div></div></div><h2>Duke Multi-Target, Multi-Camera Tracking Dataset (Duke MTMC)</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Created</div><div>2014</div></div><div><div class='gray'>Identities</div><div>Over 2,700</div></div><div><div class='gray'>Used for</div><div>Face recognition, person re-identification</div></div><div><div class='gray'>Created by</div><div>Computer Science Department, Duke University, Durham, US</div></div><div><div class='gray'>Website</div><div><a href="http://vision.cs.duke.edu/DukeMTMC/">duke.edu</a></div></div></div></div><h2>Duke Multi-Target, Multi-Camera Tracking Dataset (Duke MTMC)</h2>
 <p>[ PAGE UNDER DEVELOPMENT ]</p>
 <p>Duke MTMC is a dataset of video recorded on Duke University campus during for the purpose of training, evaluating, and improving <em>multi-target multi-camera tracking</em>. The videos were recorded during February and March 2014 and cinclude</p>
 <p>Includes a total of 888.8 minutes of video (ind. verified)</p>
@@ -89,7 +90,6 @@
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/facebook/index.html b/site/public/datasets/facebook/index.html
index 7fb1901a..e9adb3f2 100644
--- a/site/public/datasets/facebook/index.html
+++ b/site/public/datasets/facebook/index.html
@@ -27,7 +27,8 @@
   <div class="content content-">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/facebook/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>TBD</span></div><div class='hero_subdesc'><span class='bgpad'>TBD
-</span></div></div></section><section><div class='image'><div class='intro-caption caption'>TBD</div></div></section><section><h3>Statistics</h3>
+</span></div></div></section><section><div class='image'><div class='intro-caption caption'>TBD</div></div></section><section><p>{% include 'sidebar.html' %}</p>
+<h3>Statistics</h3>
 <div class='meta'><div><div class='gray'>Years</div><div>2002-2004</div></div><div><div class='gray'>Images</div><div>13,233</div></div><div><div class='gray'>Identities</div><div>5,749</div></div><div><div class='gray'>Origin</div><div>Yahoo News Images</div></div><div><div class='gray'>Funding</div><div>(Possibly, partially CIA)</div></div></div><p>Ignore content below these lines</p>
 <ul>
 <li>Tool to create face datasets from Facebook <a href="https://github.com/ankitaggarwal011/FaceGrab">https://github.com/ankitaggarwal011/FaceGrab</a></li>
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index 528d1c3d..3215fb5d 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/hrt_transgender/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>TBD</span></div><div class='hero_subdesc'><span class='bgpad'>TBD
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div></div></div><h2>HRT Transgender Dataset</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div></div></div><h2>HRT Transgender Dataset</h2>
 </section><section>
   <h3>Who used HRT Transgender?</h3>
 
@@ -83,7 +84,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index 5f076fc7..562169e4 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -27,7 +27,8 @@
   <div class="content content-">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/lfw/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Labeled Faces in The Wild (LFW)</span> is the first facial recognition dataset created entirely from online photos</span></div><div class='hero_subdesc'><span class='bgpad'>It includes 13,456 images of 4,432 people's images copied from the Internet during 2002-2004 and is the most frequently used dataset in the world for benchmarking face recognition algorithms.
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Created</div><div>2002 &ndash; 2004</div></div><div><div class='gray'>Images</div><div>13,233</div></div><div><div class='gray'>Identities</div><div>5,749</div></div><div><div class='gray'>Origin</div><div>Yahoo! News Images</div></div><div><div class='gray'>Used by</div><div>Facebook, Google, Microsoft, Baidu, Tencent, SenseTime, Face++, CIA, NSA, IARPA</div></div><div><div class='gray'>Website</div><div><a href="http://vis-www.cs.umass.edu/lfw">umass.edu</a></div></div></div><ul>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Created</div><div>2002 &ndash; 2004</div></div><div><div class='gray'>Images</div><div>13,233</div></div><div><div class='gray'>Identities</div><div>5,749</div></div><div><div class='gray'>Origin</div><div>Yahoo! News Images</div></div><div><div class='gray'>Used by</div><div>Facebook, Google, Microsoft, Baidu, Tencent, SenseTime, Face++, CIA, NSA, IARPA</div></div><div><div class='gray'>Website</div><div><a href="http://vis-www.cs.umass.edu/lfw">umass.edu</a></div></div></div><ul>
 <li>There are about 3 men for every 1 woman in the LFW dataset<a class="footnote_shim" name="[^lfw_www]_1"> </a><a href="#[^lfw_www]" class="footnote" title="Footnote 1">1</a></li>
 <li>The person with the most images is <a href="http://vis-www.cs.umass.edu/lfw/person/George_W_Bush_comp.html">George W. Bush</a> with 530</li>
 <li>There are about 3 George W. Bush's for every 1 <a href="http://vis-www.cs.umass.edu/lfw/person/Tony_Blair.html">Tony Blair</a></li>
@@ -99,7 +100,6 @@
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index 951646e3..7d9f87f6 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/market_1501/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Market-1501</span> is a dataset is collection of CCTV footage from ...</span></div><div class='hero_subdesc'><span class='bgpad'>The Market-1501 dataset includes ...
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>Market-1501 ...</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>Market-1501 ...</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 </section><section>
 	
@@ -69,7 +70,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index 9a671c8e..ecab4c3a 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/msceleb/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>MS Celeb is a dataset of web images used for training and evaluating face recognition algorithms</span></div><div class='hero_subdesc'><span class='bgpad'>The MS Celeb dataset includes over 10,000,000 images and 93,000 identities of semi-public figures collected using the Bing search engine
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div><div><div class='gray'>Created by</div><div>TBD</div></div></div></div><h2>Microsoft Celeb Dataset (MS Celeb)</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div><div><div class='gray'>Created by</div><div>TBD</div></div></div></div><h2>Microsoft Celeb Dataset (MS Celeb)</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 <p>At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.</p>
 <p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
@@ -87,7 +88,6 @@
  --><section><p>Add more analysis here</p>
 </section><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index fe6a4742..ff4302eb 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/pipa/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name"> is a dataset...</span></div><div class='hero_subdesc'><span class='bgpad'>PIPA subdescription
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>Dataset Title TBD</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>Dataset Title TBD</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 </section><section>
 	
@@ -69,7 +70,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index 10b7603e..0925763b 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of long-range surveillance photos of students taken without their knowledge</span></div><div class='hero_subdesc'><span class='bgpad'>The UCCS dataset includes 16,149 images and 1,732 identities of students at University of Colorado Colorado Springs campus and is used for face recognition and face detection
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2018</div></div><div><div class='gray'>Images</div><div>16,149</div></div><div><div class='gray'>Identities</div><div>1,732</div></div><div><div class='gray'>Used for</div><div>Face recognition, face detection</div></div><div><div class='gray'>Created by</div><div>Unviversity of Colorado Colorado Springs (US)</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, ONR MURI, Amry SBIR, SOCOM SBIR</div></div><div><div class='gray'>Website</div><div><a href="https://vast.uccs.edu/Opensetface/">vast.uccs.edu</a></div></div></div></div><h2>Unconstrained College Students ...</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Published</div><div>2018</div></div><div><div class='gray'>Images</div><div>16,149</div></div><div><div class='gray'>Identities</div><div>1,732</div></div><div><div class='gray'>Used for</div><div>Face recognition, face detection</div></div><div><div class='gray'>Created by</div><div>Unviversity of Colorado Colorado Springs (US)</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, ONR MURI, Amry SBIR, SOCOM SBIR</div></div><div><div class='gray'>Website</div><div><a href="https://vast.uccs.edu/Opensetface/">vast.uccs.edu</a></div></div></div></div><h2>Unconstrained College Students ...</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 </section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/uccs_mean_bboxes_comp.jpg' alt=' The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey'><div class='caption'> The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey</div></div></section><section>
 	
@@ -84,7 +85,6 @@
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index cc4272c8..b838c2b9 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/viper/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">VIPeR</span> is a person re-identification dataset of images captured at UC Santa Cruz in 2007</span></div><div class='hero_subdesc'><span class='bgpad'>VIPeR contains 1,264 images and 632 persons on the UC Santa Cruz campus and is used to train person re-identification algorithms for surveillance
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2007</div></div><div><div class='gray'>Images</div><div>1,264</div></div><div><div class='gray'>Persons</div><div>632</div></div><div><div class='gray'>Created by</div><div>UC Santa Cruz</div></div></div></div><h2>VIPeR Dataset</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Published</div><div>2007</div></div><div><div class='gray'>Images</div><div>1,264</div></div><div><div class='gray'>Persons</div><div>632</div></div><div><div class='gray'>Created by</div><div>UC Santa Cruz</div></div></div></div><h2>VIPeR Dataset</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 <p><em>VIPeR (Viewpoint Invariant Pedestrian Recognition)</em> is a dataset of pedestrian images captured at University of California Santa Cruz in 2007. Accoriding to the reserachers 2 "cameras were placed in different locations in an academic setting and subjects were notified of the presence of cameras, but were not coached or instructed in any way."</p>
 <p>VIPeR is amongst the most widely used publicly available person re-identification datasets. In 2017 the VIPeR dataset was combined into a larger person re-identification created by the Chinese University of Hong Kong called PETA (PEdesTrian Attribute).</p>
@@ -86,7 +87,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/research/index.html b/site/public/research/index.html
index 303732f8..0ef57043 100644
--- a/site/public/research/index.html
+++ b/site/public/research/index.html
@@ -26,8 +26,22 @@
   </header>
   <div class="content content-">
     
-  <section><h1>Research Blog</h1>
-</section>
+  <section>
+    <h1>Research</h1>
+    <div class='meta'>
+      <div>
+        <div class='gray'>Posted</div>
+        <div>2018-12-15</div>
+      </div>
+      <div>
+        <div class='gray'>By</div>
+        <div>Adam Harvey</div>
+      </div>
+      
+    </div>
+  </section>
+
+  
 
   </div>
   <footer>
-- 
cgit v1.2.3-70-g09d2


From 087cf70c944c09c4d03f2fbcaf7c74718ccb5f8f Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 2 Apr 2019 14:47:34 +0200
Subject: cursor

---
 client/table/tabulator.css                                | 3 ++-
 site/public/about/faq/index.html                          | 1 -
 site/public/about/index.html                              | 1 -
 site/public/about/legal/index.html                        | 1 -
 site/public/about/press/index.html                        | 1 -
 site/public/datasets/50_people_one_question/index.html    | 1 -
 site/public/datasets/afad/index.html                      | 1 -
 site/public/datasets/aflw/index.html                      | 1 -
 site/public/datasets/brainwash/index.html                 | 1 -
 site/public/datasets/caltech_10k/index.html               | 1 -
 site/public/datasets/celeba/index.html                    | 1 -
 site/public/datasets/cofw/index.html                      | 1 -
 site/public/datasets/duke_mtmc/index.html                 | 1 -
 site/public/datasets/facebook/index.html                  | 1 -
 site/public/datasets/feret/index.html                     | 1 -
 site/public/datasets/hrt_transgender/index.html           | 1 -
 site/public/datasets/index.html                           | 1 -
 site/public/datasets/lfpw/index.html                      | 1 -
 site/public/datasets/lfw/index.html                       | 1 -
 site/public/datasets/market_1501/index.html               | 1 -
 site/public/datasets/msceleb/index.html                   | 1 -
 site/public/datasets/pipa/index.html                      | 1 -
 site/public/datasets/uccs/index.html                      | 1 -
 site/public/datasets/vgg_face2/index.html                 | 1 -
 site/public/datasets/viper/index.html                     | 1 -
 site/public/datasets/youtube_celebrities/index.html       | 1 -
 site/public/info/index.html                               | 1 -
 site/public/research/00_introduction/index.html           | 1 -
 site/public/research/01_from_1_to_100_pixels/index.html   | 1 -
 site/public/research/02_what_computers_can_see/index.html | 1 -
 site/public/research/index.html                           | 1 -
 site/public/test/chart/index.html                         | 1 -
 site/public/test/citations/index.html                     | 1 -
 site/public/test/csv/index.html                           | 1 -
 site/public/test/datasets/index.html                      | 1 -
 site/public/test/face_search/index.html                   | 1 -
 site/public/test/gallery/index.html                       | 1 -
 site/public/test/index.html                               | 1 -
 site/public/test/map/index.html                           | 1 -
 site/public/test/name_search/index.html                   | 1 -
 site/public/test/pie_chart/index.html                     | 1 -
 site/templates/layout.html                                | 1 -
 42 files changed, 2 insertions(+), 42 deletions(-)

(limited to 'site')

diff --git a/client/table/tabulator.css b/client/table/tabulator.css
index 17dad62a..9a7ca00e 100644
--- a/client/table/tabulator.css
+++ b/client/table/tabulator.css
@@ -9,6 +9,7 @@
   background-color: #333;
 }
 .desktop .tabulator-row.tabulator-selectable:hover {
+  cursor: text;
   background-color: #555;
 }
 .tabulator-row .tabulator-cell {
@@ -35,7 +36,7 @@
   max-width: 400px;
   margin-bottom: 10px;
   background-image: url(/assets/img/icon-search.png);
-  background-position: 390px center;
+  background-position: 380px center;
   background-repeat: no-repeat;
   box-shadow: 0px 2px 4px rgba(0,0,0,0.2);
   border: 0;
diff --git a/site/public/about/faq/index.html b/site/public/about/faq/index.html
index b86dac22..00e5d719 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' />
diff --git a/site/public/about/index.html b/site/public/about/index.html
index 18ad797a..d5d72b04 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' />
diff --git a/site/public/about/legal/index.html b/site/public/about/legal/index.html
index 331712ba..b27e9188 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' />
diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html
index 3fc33969..e09bf732 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' />
diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index 8afe69e3..e3006385 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/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' />
diff --git a/site/public/datasets/afad/index.html b/site/public/datasets/afad/index.html
index a0aea1a6..8254d4fa 100644
--- a/site/public/datasets/afad/index.html
+++ b/site/public/datasets/afad/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' />
diff --git a/site/public/datasets/aflw/index.html b/site/public/datasets/aflw/index.html
index 7aaa9af0..6c7b2397 100644
--- a/site/public/datasets/aflw/index.html
+++ b/site/public/datasets/aflw/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' />
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index c0830a96..2a839a24 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/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' />
diff --git a/site/public/datasets/caltech_10k/index.html b/site/public/datasets/caltech_10k/index.html
index 6615bb1a..9692fb2b 100644
--- a/site/public/datasets/caltech_10k/index.html
+++ b/site/public/datasets/caltech_10k/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' />
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index b8300dbf..5e8c5fce 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/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' />
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 84d38f1f..2da951ee 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/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' />
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index dcd01308..f5c94620 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/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' />
diff --git a/site/public/datasets/facebook/index.html b/site/public/datasets/facebook/index.html
index 7fb1901a..bdfb658f 100644
--- a/site/public/datasets/facebook/index.html
+++ b/site/public/datasets/facebook/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' />
diff --git a/site/public/datasets/feret/index.html b/site/public/datasets/feret/index.html
index ce60f3de..4cd57413 100644
--- a/site/public/datasets/feret/index.html
+++ b/site/public/datasets/feret/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' />
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index 05a49b9b..8d472c3b 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/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' />
diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html
index 3a2dbd52..c43b2097 100644
--- a/site/public/datasets/index.html
+++ b/site/public/datasets/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' />
diff --git a/site/public/datasets/lfpw/index.html b/site/public/datasets/lfpw/index.html
index 087d8b1d..fae3cc93 100644
--- a/site/public/datasets/lfpw/index.html
+++ b/site/public/datasets/lfpw/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' />
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index 22c8c1ad..4b22fdf4 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/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' />
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index 2761a7c7..bacc5b16 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/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' />
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index 21a14129..7a3d2bab 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/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' />
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index d74ae49e..89d42a0b 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/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' />
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index 4de64ebc..56c3a7c5 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/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' />
diff --git a/site/public/datasets/vgg_face2/index.html b/site/public/datasets/vgg_face2/index.html
index 42e3b961..dc8f1ebc 100644
--- a/site/public/datasets/vgg_face2/index.html
+++ b/site/public/datasets/vgg_face2/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' />
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index 2610d1a1..29638ed7 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/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' />
diff --git a/site/public/datasets/youtube_celebrities/index.html b/site/public/datasets/youtube_celebrities/index.html
index dd230926..d7030588 100644
--- a/site/public/datasets/youtube_celebrities/index.html
+++ b/site/public/datasets/youtube_celebrities/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' />
diff --git a/site/public/info/index.html b/site/public/info/index.html
index ef7dc8db..d535b672 100644
--- a/site/public/info/index.html
+++ b/site/public/info/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' />
diff --git a/site/public/research/00_introduction/index.html b/site/public/research/00_introduction/index.html
index 5c536dc4..89ca3bb5 100644
--- a/site/public/research/00_introduction/index.html
+++ b/site/public/research/00_introduction/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' />
diff --git a/site/public/research/01_from_1_to_100_pixels/index.html b/site/public/research/01_from_1_to_100_pixels/index.html
index 37fc367f..f60df65e 100644
--- a/site/public/research/01_from_1_to_100_pixels/index.html
+++ b/site/public/research/01_from_1_to_100_pixels/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' />
diff --git a/site/public/research/02_what_computers_can_see/index.html b/site/public/research/02_what_computers_can_see/index.html
index 0fce1373..2a9b9c23 100644
--- a/site/public/research/02_what_computers_can_see/index.html
+++ b/site/public/research/02_what_computers_can_see/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' />
diff --git a/site/public/research/index.html b/site/public/research/index.html
index 303732f8..dc49e849 100644
--- a/site/public/research/index.html
+++ b/site/public/research/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' />
diff --git a/site/public/test/chart/index.html b/site/public/test/chart/index.html
index 93e12b3c..4968224f 100644
--- a/site/public/test/chart/index.html
+++ b/site/public/test/chart/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' />
diff --git a/site/public/test/citations/index.html b/site/public/test/citations/index.html
index 70b3fe55..3bc07693 100644
--- a/site/public/test/citations/index.html
+++ b/site/public/test/citations/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' />
diff --git a/site/public/test/csv/index.html b/site/public/test/csv/index.html
index 70a7d257..8683b4a1 100644
--- a/site/public/test/csv/index.html
+++ b/site/public/test/csv/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' />
diff --git a/site/public/test/datasets/index.html b/site/public/test/datasets/index.html
index 15edf039..f0dda184 100644
--- a/site/public/test/datasets/index.html
+++ b/site/public/test/datasets/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' />
diff --git a/site/public/test/face_search/index.html b/site/public/test/face_search/index.html
index 93dc2bc6..ad1f59c0 100644
--- a/site/public/test/face_search/index.html
+++ b/site/public/test/face_search/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' />
diff --git a/site/public/test/gallery/index.html b/site/public/test/gallery/index.html
index 9e2c54f6..354baa24 100644
--- a/site/public/test/gallery/index.html
+++ b/site/public/test/gallery/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' />
diff --git a/site/public/test/index.html b/site/public/test/index.html
index 0fc839d0..ab06c922 100644
--- a/site/public/test/index.html
+++ b/site/public/test/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' />
diff --git a/site/public/test/map/index.html b/site/public/test/map/index.html
index 4f4e7093..bde62f4f 100644
--- a/site/public/test/map/index.html
+++ b/site/public/test/map/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' />
diff --git a/site/public/test/name_search/index.html b/site/public/test/name_search/index.html
index 4e3ef428..1cc71731 100644
--- a/site/public/test/name_search/index.html
+++ b/site/public/test/name_search/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' />
diff --git a/site/public/test/pie_chart/index.html b/site/public/test/pie_chart/index.html
index 7dd159a3..169a6d6a 100644
--- a/site/public/test/pie_chart/index.html
+++ b/site/public/test/pie_chart/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' />
diff --git a/site/templates/layout.html b/site/templates/layout.html
index b5b7880c..d51e4b6a 100644
--- a/site/templates/layout.html
+++ b/site/templates/layout.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' />
-- 
cgit v1.2.3-70-g09d2


From 9280b2ad356b7f0cda38f9e14eb91b89f076e9c1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 2 Apr 2019 15:50:01 +0200
Subject: clamp citations height. add waypoint

---
 client/index.js                           | 20 ++++++++++++++++++++
 client/table/citations.table.js           |  2 +-
 client/table/file.table.js                |  2 +-
 package-lock.json                         | 20 ++++++++++++++++++++
 package.json                              |  4 +++-
 site/assets/css/css.css                   | 14 ++++++++++----
 site/public/datasets/brainwash/index.html |  1 +
 site/templates/layout.html                |  1 +
 8 files changed, 57 insertions(+), 7 deletions(-)

(limited to 'site')

diff --git a/client/index.js b/client/index.js
index 5e36d341..c09aece7 100644
--- a/client/index.js
+++ b/client/index.js
@@ -2,6 +2,7 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import { AppContainer } from 'react-hot-loader'
 import { Provider } from 'react-redux'
+import 'waypoints/lib/noframework.waypoints.min.js';
 
 import { toArray } from './util'
 import Applet from './applet'
@@ -112,6 +113,24 @@ function runApplets() {
   }
 }
 
+function buildWaypoints() {
+  const element = document.querySelector('.content section:nth-child(2)')
+  if (element) {
+    var waypoint = new Waypoint({
+      element,
+      handler: function(direction) {
+        if (direction === 'down') {
+          document.body.classList.add('scrolled')
+        } else {
+          document.body.classList.remove('scrolled')
+        }
+        // console.log(direction)
+        // console.log('Scrolled to waypoint!')
+      }
+    })
+  }
+}
+
 function main() {
   const paras = document.querySelectorAll('section p')
   // if (paras.length) {
@@ -123,6 +142,7 @@ function main() {
     }
   })
   runApplets()
+  buildWaypoints()
 }
 
 main()
diff --git a/client/table/citations.table.js b/client/table/citations.table.js
index bbc55047..178cc65b 100644
--- a/client/table/citations.table.js
+++ b/client/table/citations.table.js
@@ -117,7 +117,7 @@ class CitationsTable extends Component {
           columns={citationsColumns}
           data={filteredCitations}
           options={{
-            height: 311,
+            height: Math.max(104, Math.min(37 * formattedCitations.length + 29, 311)),
             layout: 'fitColumns',
             placeholder: formattedCitations.length ? '' : 'Nothing matches your query',
           }}
diff --git a/client/table/file.table.js b/client/table/file.table.js
index 82c01ac5..db53243a 100644
--- a/client/table/file.table.js
+++ b/client/table/file.table.js
@@ -71,7 +71,7 @@ class FileTable extends Component {
         columns={this.state.columns}
         data={this.state.data}
         options={{
-          height: 311,
+          height: Math.min(37 * this.state.data.length + 29, 311),
           layout: 'fitColumns',
           placeholder: 'No Data Set',
         }}
diff --git a/package-lock.json b/package-lock.json
index 43ee0cbf..54e60fad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2061,6 +2061,11 @@
         "date-now": "^0.1.4"
       }
     },
+    "consolidated-events": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/consolidated-events/-/consolidated-events-2.0.2.tgz",
+      "integrity": "sha512-2/uRVMdRypf5z/TW/ncD/66l75P5hH2vM/GR8Jf8HLc2xnfJtmina6F6du8+v4Z2vTrMo7jC+W1tmEEuuELgkQ=="
+    },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -7351,6 +7356,16 @@
       "resolved": "https://registry.npmjs.org/react-tag-autocomplete/-/react-tag-autocomplete-5.8.2.tgz",
       "integrity": "sha512-GkOQrSLjvWo98IeqRuGgc77zaxSMyMjy+b2Rc+m9jMKTWopF9h5Lf2F/X1oK9hcnUCeUmJ5QVpc/dx9MgOA2Iw=="
     },
+    "react-waypoint": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/react-waypoint/-/react-waypoint-9.0.1.tgz",
+      "integrity": "sha512-AdP1EhU5fOFne1aEfZPv2AhVC+cGJ3TxITOnZM9tBBlXOOhz3lXtTSHdicRCY+2VBqerT6zD1tAtp89Mng+Chg==",
+      "requires": {
+        "consolidated-events": "^1.1.0 || ^2.0.0",
+        "prop-types": "^15.0.0",
+        "react-is": "^16.6.3"
+      }
+    },
     "read-pkg": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -9874,6 +9889,11 @@
         }
       }
     },
+    "waypoints": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/waypoints/-/waypoints-4.0.1.tgz",
+      "integrity": "sha1-CZeaBXOBCylifLpDZqKEoGLsacg="
+    },
     "wbuf": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
diff --git a/package.json b/package.json
index 75fbebb7..bbd3d763 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
     "react-router-dom": "^4.3.1",
     "react-spin": "^0.6.2",
     "react-tabulator": "^0.9.1",
+    "react-waypoint": "^9.0.1",
     "redux": "^4.0.0",
     "redux-thunk": "^2.3.0",
     "snapsvg": "^0.5.1",
@@ -65,7 +66,8 @@
     "three": "^0.100.0",
     "three-orbitcontrols": "^2.99.1",
     "three.meshline": "^1.1.0",
-    "three.textsprite": "^18.10.24"
+    "three.textsprite": "^18.10.24",
+    "waypoints": "^4.0.1"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index a09234d3..824819a9 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -64,10 +64,16 @@ header .site_name {
   line-height: 11px;
   letter-spacing: 3px;
 }
-header .site_name.splash{
- font-size: 20px; 
- line-height: 20px;
- font-weight: 400;
+header .splash{
+  font-size: 15px;
+  font-weight: 400;
+  color: #888;
+  padding-left: 8px;
+  opacity: 0;
+  transition: 0.3s opacity cubic-bezier(0,0,1,1);
+}
+.scrolled header .splash {
+  opacity: 1;
 }
 header .links{
   font-size: 18px;
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index 2a839a24..ec5ee434 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>Brainwash</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/templates/layout.html b/site/templates/layout.html
index d51e4b6a..7b610523 100644
--- a/site/templates/layout.html
+++ b/site/templates/layout.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>{{ metadata.meta.dataset.name_short }}</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
-- 
cgit v1.2.3-70-g09d2


From 5d865f3fe53bfc96625f7624c542f96306567f21 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 2 Apr 2019 15:54:26 +0200
Subject: rebuild

---
 site/public/about/faq/index.html                          | 1 +
 site/public/about/index.html                              | 1 +
 site/public/about/legal/index.html                        | 1 +
 site/public/about/press/index.html                        | 1 +
 site/public/datasets/50_people_one_question/index.html    | 1 +
 site/public/datasets/afad/index.html                      | 1 +
 site/public/datasets/aflw/index.html                      | 1 +
 site/public/datasets/caltech_10k/index.html               | 1 +
 site/public/datasets/celeba/index.html                    | 1 +
 site/public/datasets/cofw/index.html                      | 1 +
 site/public/datasets/duke_mtmc/index.html                 | 1 +
 site/public/datasets/facebook/index.html                  | 1 +
 site/public/datasets/feret/index.html                     | 1 +
 site/public/datasets/hrt_transgender/index.html           | 1 +
 site/public/datasets/index.html                           | 1 +
 site/public/datasets/lfpw/index.html                      | 1 +
 site/public/datasets/lfw/index.html                       | 1 +
 site/public/datasets/market_1501/index.html               | 1 +
 site/public/datasets/msceleb/index.html                   | 1 +
 site/public/datasets/pipa/index.html                      | 1 +
 site/public/datasets/uccs/index.html                      | 1 +
 site/public/datasets/vgg_face2/index.html                 | 1 +
 site/public/datasets/viper/index.html                     | 1 +
 site/public/datasets/youtube_celebrities/index.html       | 1 +
 site/public/info/index.html                               | 1 +
 site/public/research/00_introduction/index.html           | 1 +
 site/public/research/01_from_1_to_100_pixels/index.html   | 1 +
 site/public/research/02_what_computers_can_see/index.html | 1 +
 site/public/research/index.html                           | 1 +
 site/public/test/chart/index.html                         | 1 +
 site/public/test/citations/index.html                     | 1 +
 site/public/test/csv/index.html                           | 1 +
 site/public/test/datasets/index.html                      | 1 +
 site/public/test/face_search/index.html                   | 1 +
 site/public/test/gallery/index.html                       | 1 +
 site/public/test/index.html                               | 1 +
 site/public/test/map/index.html                           | 1 +
 site/public/test/name_search/index.html                   | 1 +
 site/public/test/pie_chart/index.html                     | 1 +
 site/templates/layout.html                                | 2 +-
 40 files changed, 40 insertions(+), 1 deletion(-)

(limited to 'site')

diff --git a/site/public/about/faq/index.html b/site/public/about/faq/index.html
index 00e5d719..168abd0b 100644
--- a/site/public/about/faq/index.html
+++ b/site/public/about/faq/index.html
@@ -17,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 d5d72b04..c379ec43 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -17,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/legal/index.html b/site/public/about/legal/index.html
index b27e9188..4e84a601 100644
--- a/site/public/about/legal/index.html
+++ b/site/public/about/legal/index.html
@@ -17,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/press/index.html b/site/public/about/press/index.html
index e09bf732..610fda6e 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -17,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/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index e3006385..796af8d6 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>50 People One Question</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/afad/index.html b/site/public/datasets/afad/index.html
index 8254d4fa..ac025a80 100644
--- a/site/public/datasets/afad/index.html
+++ b/site/public/datasets/afad/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>AFAD</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/aflw/index.html b/site/public/datasets/aflw/index.html
index 6c7b2397..476f390c 100644
--- a/site/public/datasets/aflw/index.html
+++ b/site/public/datasets/aflw/index.html
@@ -17,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/datasets/caltech_10k/index.html b/site/public/datasets/caltech_10k/index.html
index 9692fb2b..9aa0b2c3 100644
--- a/site/public/datasets/caltech_10k/index.html
+++ b/site/public/datasets/caltech_10k/index.html
@@ -17,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/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index 5e8c5fce..26a43803 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>CelebA</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 2da951ee..8925d4b8 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>COFW</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index f5c94620..37de48ad 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>Duke MTMC</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/facebook/index.html b/site/public/datasets/facebook/index.html
index bdfb658f..b2943e1f 100644
--- a/site/public/datasets/facebook/index.html
+++ b/site/public/datasets/facebook/index.html
@@ -17,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/datasets/feret/index.html b/site/public/datasets/feret/index.html
index 4cd57413..45510f64 100644
--- a/site/public/datasets/feret/index.html
+++ b/site/public/datasets/feret/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>LFW</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index 8d472c3b..80a4f40b 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>HRT Transgender</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html
index c43b2097..f4776f6a 100644
--- a/site/public/datasets/index.html
+++ b/site/public/datasets/index.html
@@ -17,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/datasets/lfpw/index.html b/site/public/datasets/lfpw/index.html
index fae3cc93..77189ce7 100644
--- a/site/public/datasets/lfpw/index.html
+++ b/site/public/datasets/lfpw/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>LFWP</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index 4b22fdf4..d451d0cd 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>LFW</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index bacc5b16..1ffd7e6c 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>Market 1501</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index 7a3d2bab..fb08c737 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>MsCeleb</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index 89d42a0b..27168c5c 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>PIPA</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index 56c3a7c5..593ac498 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>UCCS</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/vgg_face2/index.html b/site/public/datasets/vgg_face2/index.html
index dc8f1ebc..d5c1d98c 100644
--- a/site/public/datasets/vgg_face2/index.html
+++ b/site/public/datasets/vgg_face2/index.html
@@ -17,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/datasets/viper/index.html b/site/public/datasets/viper/index.html
index 29638ed7..6d27b15b 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>VIPeR</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/datasets/youtube_celebrities/index.html b/site/public/datasets/youtube_celebrities/index.html
index d7030588..ee11f3c0 100644
--- a/site/public/datasets/youtube_celebrities/index.html
+++ b/site/public/datasets/youtube_celebrities/index.html
@@ -17,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>YouTube Celebrities</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/info/index.html b/site/public/info/index.html
index d535b672..eb78b260 100644
--- a/site/public/info/index.html
+++ b/site/public/info/index.html
@@ -17,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/research/00_introduction/index.html b/site/public/research/00_introduction/index.html
index 89ca3bb5..43f95d2a 100644
--- a/site/public/research/00_introduction/index.html
+++ b/site/public/research/00_introduction/index.html
@@ -17,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/research/01_from_1_to_100_pixels/index.html b/site/public/research/01_from_1_to_100_pixels/index.html
index f60df65e..ea296960 100644
--- a/site/public/research/01_from_1_to_100_pixels/index.html
+++ b/site/public/research/01_from_1_to_100_pixels/index.html
@@ -17,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/research/02_what_computers_can_see/index.html b/site/public/research/02_what_computers_can_see/index.html
index 2a9b9c23..23641328 100644
--- a/site/public/research/02_what_computers_can_see/index.html
+++ b/site/public/research/02_what_computers_can_see/index.html
@@ -17,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/research/index.html b/site/public/research/index.html
index dc49e849..d3ed6ef3 100644
--- a/site/public/research/index.html
+++ b/site/public/research/index.html
@@ -17,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/test/chart/index.html b/site/public/test/chart/index.html
index 4968224f..53f41d6a 100644
--- a/site/public/test/chart/index.html
+++ b/site/public/test/chart/index.html
@@ -17,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/test/citations/index.html b/site/public/test/citations/index.html
index 3bc07693..e7140177 100644
--- a/site/public/test/citations/index.html
+++ b/site/public/test/citations/index.html
@@ -17,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/test/csv/index.html b/site/public/test/csv/index.html
index 8683b4a1..c47bcd57 100644
--- a/site/public/test/csv/index.html
+++ b/site/public/test/csv/index.html
@@ -17,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/test/datasets/index.html b/site/public/test/datasets/index.html
index f0dda184..61e4ef86 100644
--- a/site/public/test/datasets/index.html
+++ b/site/public/test/datasets/index.html
@@ -17,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/test/face_search/index.html b/site/public/test/face_search/index.html
index ad1f59c0..cad7ceec 100644
--- a/site/public/test/face_search/index.html
+++ b/site/public/test/face_search/index.html
@@ -17,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/test/gallery/index.html b/site/public/test/gallery/index.html
index 354baa24..7dbe020b 100644
--- a/site/public/test/gallery/index.html
+++ b/site/public/test/gallery/index.html
@@ -17,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/test/index.html b/site/public/test/index.html
index ab06c922..730d10c9 100644
--- a/site/public/test/index.html
+++ b/site/public/test/index.html
@@ -17,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/test/map/index.html b/site/public/test/map/index.html
index bde62f4f..19c09314 100644
--- a/site/public/test/map/index.html
+++ b/site/public/test/map/index.html
@@ -17,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/test/name_search/index.html b/site/public/test/name_search/index.html
index 1cc71731..f14f6f83 100644
--- a/site/public/test/name_search/index.html
+++ b/site/public/test/name_search/index.html
@@ -17,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/test/pie_chart/index.html b/site/public/test/pie_chart/index.html
index 169a6d6a..a3167090 100644
--- a/site/public/test/pie_chart/index.html
+++ b/site/public/test/pie_chart/index.html
@@ -17,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/templates/layout.html b/site/templates/layout.html
index 7b610523..d0630310 100644
--- a/site/templates/layout.html
+++ b/site/templates/layout.html
@@ -17,7 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
-      <div class='splash'>{{ metadata.meta.dataset.name_short }}</div>
+      {% if metadata.meta.dataset %}<div class='splash'>{{ metadata.meta.dataset.name_short }}</div>{% endif %}
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
-- 
cgit v1.2.3-70-g09d2