update footer

2 files changed, 11 insertions, 14 deletions

diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md
index 6d90e78f..1cb5702b 100644
--- a/site/content/pages/datasets/brainwash/index.md
+++ b/site/content/pages/datasets/brainwash/index.md
@@ -28,13 +28,13 @@ authors: Adam Harvey
 
 ## Brainwash Dataset
 
-*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] 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.[^end_to_end]
 
-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].
+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]
 
-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.
+If you happen to have been at Brainwash cafe in San Francisco at any time on October 26, November 13, or November 24 in 2014 you are most likely included in the Brainwash dataset and have unwittingly contributed to surveillance research.
 
-![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: A visualization of 81,973 head annotations from the Brainwash dataset training partition. (c) Adam Harvey](assets/brainwash_mean_overlay.jpg)
 
 
 {% include 'chart.html' %}
@@ -51,21 +51,19 @@ If you happen to have been at Brainwash cafe in San Franscisco at any time on Oc
 
 ![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 Resources
-
-- The dataset author spoke about his research at the CVPR conference in 2016 <https://www.youtube.com/watch?v=Nl2fBKxwusQ>
-
 
 TODO
 
+- include the images referenced in the chinese defence papers?
+- change supp images to 2x2 grid with bboxes
 - add bounding boxes to the header image
 - remake montage with randomized images, with bboxes
-- clean up intro text
-- verify quote citations
 
 
 ### Footnotes
 
+
 [^readme]: "readme.txt" https://exhibits.stanford.edu/data/catalog/sx925dc9385.
+[^end_to_end]: Stewart, Russel. Andriluka, Mykhaylo. "End-to-end people detection in crowded scenes". 2016. 
 [^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
diff --git a/site/templates/layout.html b/site/templates/layout.html
index b5b7880c..b795453e 100644
--- a/site/templates/layout.html
+++ b/site/templates/layout.html
@@ -30,11 +30,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;