diff --git a/.Rbuildignore b/.Rbuildignore
new file mode 100644
index 000000000..7e2545109
--- /dev/null
+++ b/.Rbuildignore
@@ -0,0 +1 @@
+^~/\.rladies_meetup_token\.rds$
diff --git a/.Rprofile b/.Rprofile
index 7d3ae9051..d1b158dbd 100644
--- a/.Rprofile
+++ b/.Rprofile
@@ -11,5 +11,5 @@ options(
   blogdown.ext = ".Rmd",
   blogdown.subdir = "post",
   blogdown.title_case = TRUE,
-  blogdown.hugo.version = "0.88.1"
+  blogdown.hugo.version = "0.101.0"
 )
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7391b7695..c6c8d1090 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,7 @@
-/themes/       @website
-/scripts/      @website
-LICENCE.md     @website
-/themes/       @website
-/static/robots.txt       @website
+/themes/                  @website
+/scripts/                 @website
+LICENCE.md                @website
+/themes/                  @website
+/static/robots.txt        @website
+/content/news             @global
 /themes/hugo-rladies/i18n/ 
diff --git a/.github/workflows/build_site.yaml b/.github/workflows/build_site.yaml
index 616b2e522..4dbdfc083 100644
--- a/.github/workflows/build_site.yaml
+++ b/.github/workflows/build_site.yaml
@@ -10,6 +10,10 @@ on:
     branches: 
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   vars:
     name: Get job variables
@@ -19,7 +23,7 @@ jobs:
       hugo_vr: ${{ steps.hugo_vr.outputs.value }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           
@@ -42,7 +46,7 @@ jobs:
     runs-on: macOS-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 2
 
@@ -57,7 +61,6 @@ jobs:
             echo "No jsons commited/changed"
             echo "::set-output name=run_validation::false"
           fi
-
       - name: Setup R
         if: steps.check_files.outputs.run_validation == 'true'
         uses: r-lib/actions/setup-r@v2
@@ -85,7 +88,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
@@ -103,26 +106,33 @@ jobs:
         run: Rscript scripts/missing_translations.R
         
       - name: Site data - Get directory data
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: rladies/directory
           ssh-key: ${{ secrets.DIRECTORY_DEPLOY_SECRET}}
           path: dir
           
       - name: Site data - Meetup
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: rladies/meetup_archive
           ssh-key: ${{ secrets.MEETUP_ARCHIVE_KEY}}
           path: mtp
-      
+
       - name: Site data - Get blogs list
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: rladies/awesome-rladies-blogs
           ssh-key: ${{ secrets.RLADIES_BLOGS_KEY}}
           path: rblogs
           
+      - name: Site data - Get meetup data
+        uses: actions/checkout@v3
+        with:
+          repository: rladies/meetup_archive
+          ssh-key: ${{ secrets.MEETUP_ARCHIVE_KEY}}
+          path: meetup_archive
+          
       - name: Site data - clean cloned repos
         run: |
           mv rblogs/blogs data/rblogs
diff --git a/.gitignore b/.gitignore
index a0cd5caa9..6e100f2ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,12 +6,10 @@
 /build/
 /resources/_gen/
 .hugo_build.lock
-
 # Executable may be added to repository
 hugo.exe
 hugo.darwin
 hugo.linux
-
 ### R ###
 # History files
 .Rhistory
@@ -20,27 +18,21 @@ hugo.linux
 .RData
 # User-specific files
 .Ruserdata
-
 # Output files from R CMD check
 /*.Rcheck/
 # RStudio files
 .Rproj.user/
-
 # knitr and R markdown default cache directories
 *_cache/
 /cache/
-
 # Temporary files created by R markdown
 *.utf8.md
 *.knit.md
-
 # End of https://www.gitignore.io/api/r,hugo
 # Meetupr auth
 **/*.httr-oauth$
-
 # stupid mac hidden files
 **/.DS_Store
-
 # html rendered content
 content/*/*html
 content/*/*/*html
@@ -50,11 +42,13 @@ README.html
 # should never be commited
 data/directory/
 static/images/directory/
+data/rblogs
 
 # npm
 node_modules/
 package-lock.json
 .meetup_token.rds
-
 # workflow tmp file
 tmp*
+~/Library/Application Support/meetupr/meetupr-token.rds
+/var/folders/ws/1mjqfpsj3kv_b_z2091qkm600000gq/T//Rtmp4EPJ8U/fileecc479130cbd.rds
diff --git a/config/_default/menu/menu.en.toml b/config/_default/menu/menu.en.toml
index 45cfc28f4..693f23674 100644
--- a/config/_default/menu/menu.en.toml
+++ b/config/_default/menu/menu.en.toml
@@ -72,6 +72,6 @@
 
 [[main]]
     name = "Blog"
-    url = "/post"
+    url = "/blog"
     weight = 5
     
\ No newline at end of file
diff --git a/config/_default/menu/menu.es.toml b/config/_default/menu/menu.es.toml
index 646ff6fb5..40f217057 100644
--- a/config/_default/menu/menu.es.toml
+++ b/config/_default/menu/menu.es.toml
@@ -74,6 +74,6 @@
     
 [[main]]
     name = "Blog"
-    url = "/post"
+    url = "/blog"
     weight = 5
     
diff --git a/config/_default/menu/menu.fr.toml b/config/_default/menu/menu.fr.toml
index fb5b54699..f2cf984a9 100644
--- a/config/_default/menu/menu.fr.toml
+++ b/config/_default/menu/menu.fr.toml
@@ -74,6 +74,6 @@
     
 [[main]]
     name = "Blog"
-    url = "/post"
+    url = "/blog"
     weight = 5
     
\ No newline at end of file
diff --git a/config/_default/menu/menu.pt.toml b/config/_default/menu/menu.pt.toml
index 58a22bac7..ea51a76e3 100644
--- a/config/_default/menu/menu.pt.toml
+++ b/config/_default/menu/menu.pt.toml
@@ -73,6 +73,6 @@
     
 [[main]]
     name = "Blog"
-    url = "/post"
+    url = "/blog"
     weight = 5
     
\ No newline at end of file
diff --git a/content/about-us/global-team/img/placeholder.png b/content/about-us/global-team/img/placeholder.png
deleted file mode 100644
index 0819c367a..000000000
Binary files a/content/about-us/global-team/img/placeholder.png and /dev/null differ
diff --git a/content/activities/rladies-blogs/index.en.md b/content/activities/rladies-blogs/index.en.md
index e875d89ec..cfc6364a2 100644
--- a/content/activities/rladies-blogs/index.en.md
+++ b/content/activities/rladies-blogs/index.en.md
@@ -5,5 +5,4 @@ type: "rladies-blogs"
 
 Curated list of awesome blogs by R-Ladies, inspired by
 
-{{< twitter 1362021673239785473 >}}
-
+{{< twitter id="1362021673239785473" user="RLadiesGlobal" >}}
diff --git a/content/post/2018-02-24-history/R-Ladies.png b/content/blog/2018-02-24-history/R-Ladies.png
similarity index 100%
rename from content/post/2018-02-24-history/R-Ladies.png
rename to content/blog/2018-02-24-history/R-Ladies.png
diff --git a/content/post/2018-02-24-history/index.en.Rmd b/content/blog/2018-02-24-history/index.en.Rmd
similarity index 100%
rename from content/post/2018-02-24-history/index.en.Rmd
rename to content/blog/2018-02-24-history/index.en.Rmd
diff --git a/content/post/2018-02-24-history/index.en.md b/content/blog/2018-02-24-history/index.en.md
similarity index 100%
rename from content/post/2018-02-24-history/index.en.md
rename to content/blog/2018-02-24-history/index.en.md
diff --git a/content/post/2018-03-26-ideation_and_creation/index.en.Rmd b/content/blog/2018-03-26-ideation_and_creation/index.en.Rmd
similarity index 100%
rename from content/post/2018-03-26-ideation_and_creation/index.en.Rmd
rename to content/blog/2018-03-26-ideation_and_creation/index.en.Rmd
diff --git a/content/post/2018-03-26-ideation_and_creation/index.en.md b/content/blog/2018-03-26-ideation_and_creation/index.en.md
similarity index 100%
rename from content/post/2018-03-26-ideation_and_creation/index.en.md
rename to content/blog/2018-03-26-ideation_and_creation/index.en.md
diff --git a/content/post/2018-03-27-deployment/index.en.Rmd b/content/blog/2018-03-27-deployment/index.en.Rmd
similarity index 100%
rename from content/post/2018-03-27-deployment/index.en.Rmd
rename to content/blog/2018-03-27-deployment/index.en.Rmd
diff --git a/content/post/2018-03-27-deployment/index.en.md b/content/blog/2018-03-27-deployment/index.en.md
similarity index 100%
rename from content/post/2018-03-27-deployment/index.en.md
rename to content/blog/2018-03-27-deployment/index.en.md
diff --git a/content/post/2018-03-28-conclusion/index.en.Rmd b/content/blog/2018-03-28-conclusion/index.en.Rmd
similarity index 100%
rename from content/post/2018-03-28-conclusion/index.en.Rmd
rename to content/blog/2018-03-28-conclusion/index.en.Rmd
diff --git a/content/post/2018-03-28-conclusion/index.en.md b/content/blog/2018-03-28-conclusion/index.en.md
similarity index 100%
rename from content/post/2018-03-28-conclusion/index.en.md
rename to content/blog/2018-03-28-conclusion/index.en.md
diff --git a/content/post/2018-10-27-vacation_grow_rladiesnetwork/index.en.Rmd b/content/blog/2018-10-27-vacation_grow_rladiesnetwork/index.en.Rmd
similarity index 100%
rename from content/post/2018-10-27-vacation_grow_rladiesnetwork/index.en.Rmd
rename to content/blog/2018-10-27-vacation_grow_rladiesnetwork/index.en.Rmd
diff --git a/content/post/2018-10-27-vacation_grow_rladiesnetwork/index.en.md b/content/blog/2018-10-27-vacation_grow_rladiesnetwork/index.en.md
similarity index 100%
rename from content/post/2018-10-27-vacation_grow_rladiesnetwork/index.en.md
rename to content/blog/2018-10-27-vacation_grow_rladiesnetwork/index.en.md
diff --git a/content/post/2018-10-27-vacation_grow_rladiesnetwork/index.es.Rmd b/content/blog/2018-10-27-vacation_grow_rladiesnetwork/index.es.Rmd
similarity index 100%
rename from content/post/2018-10-27-vacation_grow_rladiesnetwork/index.es.Rmd
rename to content/blog/2018-10-27-vacation_grow_rladiesnetwork/index.es.Rmd
diff --git a/content/post/2018-10-27-vacation_grow_rladiesnetwork/index.es.md b/content/blog/2018-10-27-vacation_grow_rladiesnetwork/index.es.md
similarity index 100%
rename from content/post/2018-10-27-vacation_grow_rladiesnetwork/index.es.md
rename to content/blog/2018-10-27-vacation_grow_rladiesnetwork/index.es.md
diff --git a/content/post/2018-10-27-vacation_grow_rladiesnetwork/laura_paloma.jpg b/content/blog/2018-10-27-vacation_grow_rladiesnetwork/laura_paloma.jpg
similarity index 100%
rename from content/post/2018-10-27-vacation_grow_rladiesnetwork/laura_paloma.jpg
rename to content/blog/2018-10-27-vacation_grow_rladiesnetwork/laura_paloma.jpg
diff --git a/content/post/2018-10-27-vacation_grow_rladiesnetwork/mine_paloma.jpg b/content/blog/2018-10-27-vacation_grow_rladiesnetwork/mine_paloma.jpg
similarity index 100%
rename from content/post/2018-10-27-vacation_grow_rladiesnetwork/mine_paloma.jpg
rename to content/blog/2018-10-27-vacation_grow_rladiesnetwork/mine_paloma.jpg
diff --git a/content/post/2018-12-12-what-happened-in-2018/index.en.Rmd b/content/blog/2018-12-12-what-happened-in-2018/index.en.Rmd
similarity index 100%
rename from content/post/2018-12-12-what-happened-in-2018/index.en.Rmd
rename to content/blog/2018-12-12-what-happened-in-2018/index.en.Rmd
diff --git a/content/post/2018-12-12-what-happened-in-2018/index.en.md b/content/blog/2018-12-12-what-happened-in-2018/index.en.md
similarity index 100%
rename from content/post/2018-12-12-what-happened-in-2018/index.en.md
rename to content/blog/2018-12-12-what-happened-in-2018/index.en.md
diff --git "a/content/post/2019-03-25-blog_iwdtwitter_2019/Chapter_Concepci\303\263n.png" "b/content/blog/2019-03-25-blog_iwdtwitter_2019/Chapter_Concepci\303\263n.png"
similarity index 100%
rename from "content/post/2019-03-25-blog_iwdtwitter_2019/Chapter_Concepci\303\263n.png"
rename to "content/blog/2019-03-25-blog_iwdtwitter_2019/Chapter_Concepci\303\263n.png"
diff --git a/content/post/2019-03-25-blog_iwdtwitter_2019/Chapter_SantaRosa.png b/content/blog/2019-03-25-blog_iwdtwitter_2019/Chapter_SantaRosa.png
similarity index 100%
rename from content/post/2019-03-25-blog_iwdtwitter_2019/Chapter_SantaRosa.png
rename to content/blog/2019-03-25-blog_iwdtwitter_2019/Chapter_SantaRosa.png
diff --git a/content/post/2019-03-25-blog_iwdtwitter_2019/ExistingChapters.jpg b/content/blog/2019-03-25-blog_iwdtwitter_2019/ExistingChapters.jpg
similarity index 100%
rename from content/post/2019-03-25-blog_iwdtwitter_2019/ExistingChapters.jpg
rename to content/blog/2019-03-25-blog_iwdtwitter_2019/ExistingChapters.jpg
diff --git a/content/post/2019-03-25-blog_iwdtwitter_2019/NewChapterPrototype.png b/content/blog/2019-03-25-blog_iwdtwitter_2019/NewChapterPrototype.png
similarity index 100%
rename from content/post/2019-03-25-blog_iwdtwitter_2019/NewChapterPrototype.png
rename to content/blog/2019-03-25-blog_iwdtwitter_2019/NewChapterPrototype.png
diff --git a/content/post/2019-03-25-blog_iwdtwitter_2019/index.en.Rmd b/content/blog/2019-03-25-blog_iwdtwitter_2019/index.en.Rmd
similarity index 100%
rename from content/post/2019-03-25-blog_iwdtwitter_2019/index.en.Rmd
rename to content/blog/2019-03-25-blog_iwdtwitter_2019/index.en.Rmd
diff --git a/content/post/2019-03-25-blog_iwdtwitter_2019/index.en.md b/content/blog/2019-03-25-blog_iwdtwitter_2019/index.en.md
similarity index 100%
rename from content/post/2019-03-25-blog_iwdtwitter_2019/index.en.md
rename to content/blog/2019-03-25-blog_iwdtwitter_2019/index.en.md
diff --git a/content/post/2019-03-25-blog_iwdtwitter_2019/index.es.Rmd b/content/blog/2019-03-25-blog_iwdtwitter_2019/index.es.Rmd
similarity index 100%
rename from content/post/2019-03-25-blog_iwdtwitter_2019/index.es.Rmd
rename to content/blog/2019-03-25-blog_iwdtwitter_2019/index.es.Rmd
diff --git a/content/post/2019-03-25-blog_iwdtwitter_2019/index.es.md b/content/blog/2019-03-25-blog_iwdtwitter_2019/index.es.md
similarity index 100%
rename from content/post/2019-03-25-blog_iwdtwitter_2019/index.es.md
rename to content/blog/2019-03-25-blog_iwdtwitter_2019/index.es.md
diff --git a/content/post/2020-01-27-RLadies_video_2019/MapaVideo.png b/content/blog/2020-01-27-RLadies_video_2019/MapaVideo.png
similarity index 100%
rename from content/post/2020-01-27-RLadies_video_2019/MapaVideo.png
rename to content/blog/2020-01-27-RLadies_video_2019/MapaVideo.png
diff --git a/content/post/2020-01-27-RLadies_video_2019/corazon.png b/content/blog/2020-01-27-RLadies_video_2019/corazon.png
similarity index 100%
rename from content/post/2020-01-27-RLadies_video_2019/corazon.png
rename to content/blog/2020-01-27-RLadies_video_2019/corazon.png
diff --git a/content/post/2020-01-27-RLadies_video_2019/index.en.Rmd b/content/blog/2020-01-27-RLadies_video_2019/index.en.Rmd
similarity index 100%
rename from content/post/2020-01-27-RLadies_video_2019/index.en.Rmd
rename to content/blog/2020-01-27-RLadies_video_2019/index.en.Rmd
diff --git a/content/post/2020-01-27-RLadies_video_2019/index.en.md b/content/blog/2020-01-27-RLadies_video_2019/index.en.md
similarity index 100%
rename from content/post/2020-01-27-RLadies_video_2019/index.en.md
rename to content/blog/2020-01-27-RLadies_video_2019/index.en.md
diff --git a/content/post/2020-01-27-RLadies_video_2019/index.es.Rmd b/content/blog/2020-01-27-RLadies_video_2019/index.es.Rmd
similarity index 100%
rename from content/post/2020-01-27-RLadies_video_2019/index.es.Rmd
rename to content/blog/2020-01-27-RLadies_video_2019/index.es.Rmd
diff --git a/content/post/2020-01-27-RLadies_video_2019/index.es.md b/content/blog/2020-01-27-RLadies_video_2019/index.es.md
similarity index 100%
rename from content/post/2020-01-27-RLadies_video_2019/index.es.md
rename to content/blog/2020-01-27-RLadies_video_2019/index.es.md
diff --git a/content/post/2020-01-27-RLadies_video_2019/placafinal.png b/content/blog/2020-01-27-RLadies_video_2019/placafinal.png
similarity index 100%
rename from content/post/2020-01-27-RLadies_video_2019/placafinal.png
rename to content/blog/2020-01-27-RLadies_video_2019/placafinal.png
diff --git a/content/post/2020-04-24-online-meetups/all_events.csv b/content/blog/2020-04-24-online-meetups/all_events.csv
similarity index 100%
rename from content/post/2020-04-24-online-meetups/all_events.csv
rename to content/blog/2020-04-24-online-meetups/all_events.csv
diff --git a/content/post/2020-04-24-online-meetups/chapters.csv b/content/blog/2020-04-24-online-meetups/chapters.csv
similarity index 100%
rename from content/post/2020-04-24-online-meetups/chapters.csv
rename to content/blog/2020-04-24-online-meetups/chapters.csv
diff --git a/content/post/2020-04-24-online-meetups/index.en.Rmd b/content/blog/2020-04-24-online-meetups/index.en.Rmd
similarity index 100%
rename from content/post/2020-04-24-online-meetups/index.en.Rmd
rename to content/blog/2020-04-24-online-meetups/index.en.Rmd
diff --git a/content/post/2020-04-24-online-meetups/index.en.md b/content/blog/2020-04-24-online-meetups/index.en.md
similarity index 100%
rename from content/post/2020-04-24-online-meetups/index.en.md
rename to content/blog/2020-04-24-online-meetups/index.en.md
diff --git a/content/post/2020-04-24-online-meetups/index.en_files/figure-html/parallel_per_month_vis-1.png b/content/blog/2020-04-24-online-meetups/index.en_files/figure-html/parallel_per_month_vis-1.png
similarity index 100%
rename from content/post/2020-04-24-online-meetups/index.en_files/figure-html/parallel_per_month_vis-1.png
rename to content/blog/2020-04-24-online-meetups/index.en_files/figure-html/parallel_per_month_vis-1.png
diff --git a/content/post/2020-04-24-online-meetups/index.en_files/figure-markdown_strict/parallel_per_month_vis-1.png b/content/blog/2020-04-24-online-meetups/index.en_files/figure-markdown_strict/parallel_per_month_vis-1.png
similarity index 100%
rename from content/post/2020-04-24-online-meetups/index.en_files/figure-markdown_strict/parallel_per_month_vis-1.png
rename to content/blog/2020-04-24-online-meetups/index.en_files/figure-markdown_strict/parallel_per_month_vis-1.png
diff --git a/content/post/2020-06-24-spanishmetameetup/index.es.Rmd b/content/blog/2020-06-24-spanishmetameetup/index.es.Rmd
similarity index 100%
rename from content/post/2020-06-24-spanishmetameetup/index.es.Rmd
rename to content/blog/2020-06-24-spanishmetameetup/index.es.Rmd
diff --git a/content/post/2020-06-24-spanishmetameetup/index.es.md b/content/blog/2020-06-24-spanishmetameetup/index.es.md
similarity index 100%
rename from content/post/2020-06-24-spanishmetameetup/index.es.md
rename to content/blog/2020-06-24-spanishmetameetup/index.es.md
diff --git a/content/post/2021-02-04-cotonout_mentoring/index.en.Rmd b/content/blog/2021-02-04-cotonout_mentoring/index.en.Rmd
similarity index 100%
rename from content/post/2021-02-04-cotonout_mentoring/index.en.Rmd
rename to content/blog/2021-02-04-cotonout_mentoring/index.en.Rmd
diff --git a/content/post/2021-02-04-cotonout_mentoring/index.en.md b/content/blog/2021-02-04-cotonout_mentoring/index.en.md
similarity index 100%
rename from content/post/2021-02-04-cotonout_mentoring/index.en.md
rename to content/blog/2021-02-04-cotonout_mentoring/index.en.md
diff --git a/content/post/2021-02-04-cotonout_mentoring/index.es.Rmd b/content/blog/2021-02-04-cotonout_mentoring/index.es.Rmd
similarity index 100%
rename from content/post/2021-02-04-cotonout_mentoring/index.es.Rmd
rename to content/blog/2021-02-04-cotonout_mentoring/index.es.Rmd
diff --git a/content/post/2021-02-04-cotonout_mentoring/index.es.md b/content/blog/2021-02-04-cotonout_mentoring/index.es.md
similarity index 100%
rename from content/post/2021-02-04-cotonout_mentoring/index.es.md
rename to content/blog/2021-02-04-cotonout_mentoring/index.es.md
diff --git a/content/post/2021-02-04-cotonout_mentoring/index.fr.Rmd b/content/blog/2021-02-04-cotonout_mentoring/index.fr.Rmd
similarity index 100%
rename from content/post/2021-02-04-cotonout_mentoring/index.fr.Rmd
rename to content/blog/2021-02-04-cotonout_mentoring/index.fr.Rmd
diff --git a/content/post/2021-02-04-cotonout_mentoring/index.fr.md b/content/blog/2021-02-04-cotonout_mentoring/index.fr.md
similarity index 100%
rename from content/post/2021-02-04-cotonout_mentoring/index.fr.md
rename to content/blog/2021-02-04-cotonout_mentoring/index.fr.md
diff --git a/content/post/2021-02-04-cotonout_mentoring/rladies_cotonou_fig02.jpg b/content/blog/2021-02-04-cotonout_mentoring/rladies_cotonou_fig02.jpg
similarity index 100%
rename from content/post/2021-02-04-cotonout_mentoring/rladies_cotonou_fig02.jpg
rename to content/blog/2021-02-04-cotonout_mentoring/rladies_cotonou_fig02.jpg
diff --git a/content/post/2021-02-04-cotonout_mentoring/rladies_cotonou_fig03.jpg b/content/blog/2021-02-04-cotonout_mentoring/rladies_cotonou_fig03.jpg
similarity index 100%
rename from content/post/2021-02-04-cotonout_mentoring/rladies_cotonou_fig03.jpg
rename to content/blog/2021-02-04-cotonout_mentoring/rladies_cotonou_fig03.jpg
diff --git a/content/blog/_index.md b/content/blog/_index.md
new file mode 100644
index 000000000..4142984af
--- /dev/null
+++ b/content/blog/_index.md
@@ -0,0 +1,4 @@
+---
+title: "Blog posts"
+type: post
+---
\ No newline at end of file
diff --git a/content/post/2019-04-08-statement-about-datacamp/index.en.Rmd b/content/news/2019-04-08-statement-about-datacamp/index.en.Rmd
similarity index 100%
rename from content/post/2019-04-08-statement-about-datacamp/index.en.Rmd
rename to content/news/2019-04-08-statement-about-datacamp/index.en.Rmd
diff --git a/content/post/2019-04-08-statement-about-datacamp/index.en.md b/content/news/2019-04-08-statement-about-datacamp/index.en.md
similarity index 98%
rename from content/post/2019-04-08-statement-about-datacamp/index.en.md
rename to content/news/2019-04-08-statement-about-datacamp/index.en.md
index 3ce0dad67..817f2f4a0 100644
--- a/content/post/2019-04-08-statement-about-datacamp/index.en.md
+++ b/content/news/2019-04-08-statement-about-datacamp/index.en.md
@@ -77,4 +77,4 @@ Let's keep working on a safe community for everyone!
 
 + 2019-04-16, Julia Silge - [Writing a letter to DataCamp ](https://juliasilge.com/blog/datacamp-misconduct/)
 
-`{{% tweet "1116743032492253185" %}}`{=html}
+`{{% tweet user="EngelhardtCR" id="1116743032492253185" %}}`{=html}
diff --git a/content/post/2019-10-22-datacamp-third-party-review/index.en.Rmd b/content/news/2019-10-22-datacamp-third-party-review/index.en.Rmd
similarity index 100%
rename from content/post/2019-10-22-datacamp-third-party-review/index.en.Rmd
rename to content/news/2019-10-22-datacamp-third-party-review/index.en.Rmd
diff --git a/content/post/2019-10-22-datacamp-third-party-review/index.en.md b/content/news/2019-10-22-datacamp-third-party-review/index.en.md
similarity index 100%
rename from content/post/2019-10-22-datacamp-third-party-review/index.en.md
rename to content/news/2019-10-22-datacamp-third-party-review/index.en.md
diff --git a/content/post/2019-12-18-gdq-departure/index.en.Rmd b/content/news/2019-12-18-gdq-departure/index.en.Rmd
similarity index 100%
rename from content/post/2019-12-18-gdq-departure/index.en.Rmd
rename to content/news/2019-12-18-gdq-departure/index.en.Rmd
diff --git a/content/post/2019-12-18-gdq-departure/index.en.md b/content/news/2019-12-18-gdq-departure/index.en.md
similarity index 100%
rename from content/post/2019-12-18-gdq-departure/index.en.md
rename to content/news/2019-12-18-gdq-departure/index.en.md
diff --git a/content/post/2020-06-06-blm/index.en.Rmd b/content/news/2020-06-06-blm/index.en.Rmd
similarity index 100%
rename from content/post/2020-06-06-blm/index.en.Rmd
rename to content/news/2020-06-06-blm/index.en.Rmd
diff --git a/content/post/2020-06-06-blm/index.en.md b/content/news/2020-06-06-blm/index.en.md
similarity index 100%
rename from content/post/2020-06-06-blm/index.en.md
rename to content/news/2020-06-06-blm/index.en.md
diff --git a/content/post/2020-06-06-blm/index.es.Rmd b/content/news/2020-06-06-blm/index.es.Rmd
similarity index 100%
rename from content/post/2020-06-06-blm/index.es.Rmd
rename to content/news/2020-06-06-blm/index.es.Rmd
diff --git a/content/post/2020-06-06-blm/index.es.md b/content/news/2020-06-06-blm/index.es.md
similarity index 100%
rename from content/post/2020-06-06-blm/index.es.md
rename to content/news/2020-06-06-blm/index.es.md
diff --git a/content/post/2020-06-06-blm/index.fr.Rmd b/content/news/2020-06-06-blm/index.fr.Rmd
similarity index 100%
rename from content/post/2020-06-06-blm/index.fr.Rmd
rename to content/news/2020-06-06-blm/index.fr.Rmd
diff --git a/content/post/2020-06-06-blm/index.fr.md b/content/news/2020-06-06-blm/index.fr.md
similarity index 100%
rename from content/post/2020-06-06-blm/index.fr.md
rename to content/news/2020-06-06-blm/index.fr.md
diff --git a/content/post/2020-06-06-blm/index.pt.Rmd b/content/news/2020-06-06-blm/index.pt.Rmd
similarity index 100%
rename from content/post/2020-06-06-blm/index.pt.Rmd
rename to content/news/2020-06-06-blm/index.pt.Rmd
diff --git a/content/post/2020-06-06-blm/index.pt.md b/content/news/2020-06-06-blm/index.pt.md
similarity index 100%
rename from content/post/2020-06-06-blm/index.pt.md
rename to content/news/2020-06-06-blm/index.pt.md
diff --git a/content/post/2020-11-23-reduced-service-note/index.en.Rmd b/content/news/2020-11-23-reduced-service-note/index.en.Rmd
similarity index 100%
rename from content/post/2020-11-23-reduced-service-note/index.en.Rmd
rename to content/news/2020-11-23-reduced-service-note/index.en.Rmd
diff --git a/content/post/2020-11-23-reduced-service-note/index.en.md b/content/news/2020-11-23-reduced-service-note/index.en.md
similarity index 100%
rename from content/post/2020-11-23-reduced-service-note/index.en.md
rename to content/news/2020-11-23-reduced-service-note/index.en.md
diff --git a/content/news/_index.md b/content/news/_index.md
new file mode 100644
index 000000000..d50b1dccc
--- /dev/null
+++ b/content/news/_index.md
@@ -0,0 +1,4 @@
+---
+title: "News from the Global Team"
+type: post
+---
\ No newline at end of file
diff --git a/data/blogs_mock/drmowinckels.io.json b/data/blogs_mock/drmowinckels.io.json
index 9b2161e44..95c513125 100644
--- a/data/blogs_mock/drmowinckels.io.json
+++ b/data/blogs_mock/drmowinckels.io.json
@@ -5,13 +5,17 @@
   "url": "https://drmowinckels.io",
   "photo_url": "https://rladies.org/wp-content/uploads/connections-images/athanasia-mo-mowinckel/Athanasia.Mowinckel.2_square.png",
   "description": "Personal website and blog about R and neuromaging in R.",
-  "authors": [
-    {
+  "authors": [{
       "name": "Athanasia Mo  Mowinckel",
       "social_media": [{
         "twitter": "DrMowinckels",
         "github": "Athanasiamo"
+        }]
+      },
+      {
+      "name": "Maëlle Salmon",
+      "social_media": [{
+        "twitter": "ma_salmon"
       }]
-    }
-  ]
+    }]
 }
diff --git a/data/directory_mock/23u5y2o.json b/data/directory_mock/23u5y2o.json
index b64596fe9..870eacc43 100644
--- a/data/directory_mock/23u5y2o.json
+++ b/data/directory_mock/23u5y2o.json
@@ -1,31 +1,28 @@
 {
-    "name": "Athanasia Mo  Mowinckel",
-    "honorific": "PhD",
-    "categories": ["Speaker", "Norway"],
-    "title": "Staff researcher - Center for Lifespan Changes in Brain and Cognition, Dept. of Psychology",
-    "organization": "University of Oslo",
-    "department": "",
-    "notes": "",
-    "photo_url": "https://rladies.org/wp-content/uploads/connections-images/athanasia-mo-mowinckel/Athanasia.Mowinckel.2_square.png",
-    "logo_url": "",
-    "location": [
-      {
-        "city": "Oslo",
-        "country": "Norway"
-      }
-    ],
-    "social_media": [
-      {
-        "twitter": "DrMowinckels",
-        "github": "Athanasiamo"
-      }
-    ],
-    "interests": ["Statistics", "Bayesian Statistics", "Neuroimaging", "Data Visualisation", "Cognitive Psychology"],
-    "contact_method": ["Twitter"],
-    "activities": [
-      {
-        "r_groups": ["R-Ladies Oslo"],
-        "r_packages": ["ggseg", "ggsegExtra", "ggseg3d"]
-      }
-    ]
-  }
\ No newline at end of file
+  "name": "Athanasia Mo  Mowinckel",
+  "honorific": "PhD",
+  "categories": ["Speaker", "Norway"],
+  "location": {
+    "city": "Oslo",
+    "country": "Norway"
+  },
+  "social_media": {
+    "twitter": "DrMowinckels",
+    "github": "Athanasiamo"
+  },
+  "interests": ["Statistics", "Bayesian Statistics", "Neuroimaging", "Data Visualisation", "Cognitive Psychology"],
+  "contact_method": ["Twitter"],
+  "activities": {
+    "r_groups": ["R-Ladies Oslo"],
+    "r_packages": ["ggseg", "ggsegExtra", "ggseg3d"]
+  },
+  "work": {
+    "title": "Staff researcher",
+    "organisation": "University of Oslo",
+    "department": "Center for Lifespan Changes in Brain and Cognition, Dept. of Psychology"
+  },
+  "photo": {
+    "url": "https://rladies.org/wp-content/uploads/connections-images/athanasia-mo-mowinckel/Athanasia.Mowinckel.2_square.png",
+    "credit": "Tron Tronsdal"
+  }
+}
diff --git a/data/directory_mock/2o3y207.json b/data/directory_mock/2o3y207.json
index 6c96d4df9..e90409d9a 100644
--- a/data/directory_mock/2o3y207.json
+++ b/data/directory_mock/2o3y207.json
@@ -1,27 +1,15 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Honolulu",
-       "state": "Hawaii",
-       "country": "USA"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Honolulu",
+    "state": "Hawaii",
+    "country": "USA"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_1.json b/data/directory_mock/2o3y207_1.json
index f942bf566..fba56067e 100644
--- a/data/directory_mock/2o3y207_1.json
+++ b/data/directory_mock/2o3y207_1.json
@@ -1,26 +1,15 @@
 {
-    "name": "Yara Doe",
-    "honorific": "MD",
-    "categories": [],
-    "title": "Data scientist",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Stockholm",
-       "country": "Sweden"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Yara Doe",
+  "honorific": "MD",
+  "location": {
+    "city": "Stockholm",
+    "country": "Sweden"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data scientist"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_10.json b/data/directory_mock/2o3y207_10.json
index af88aff5c..f6850fa52 100644
--- a/data/directory_mock/2o3y207_10.json
+++ b/data/directory_mock/2o3y207_10.json
@@ -1,26 +1,14 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "New Dehli",
-       "country": "India"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "New Dehli",
+    "country": "India"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_11.json b/data/directory_mock/2o3y207_11.json
index 1c44c076c..62d594ed4 100644
--- a/data/directory_mock/2o3y207_11.json
+++ b/data/directory_mock/2o3y207_11.json
@@ -1,26 +1,14 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Ankara",
-       "country": "Turkey"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Ankara",
+    "country": "Turkey"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_12.json b/data/directory_mock/2o3y207_12.json
index 9173d3f66..f36f1288a 100644
--- a/data/directory_mock/2o3y207_12.json
+++ b/data/directory_mock/2o3y207_12.json
@@ -1,26 +1,14 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Berlin",
-       "country": "Germany"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Berlin",
+    "country": "Germany"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_13.json b/data/directory_mock/2o3y207_13.json
index 69e9f6d5c..c7cc9c598 100644
--- a/data/directory_mock/2o3y207_13.json
+++ b/data/directory_mock/2o3y207_13.json
@@ -1,26 +1,14 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Toronto",
-       "country": "Canada"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Toronto",
+    "country": "Canada"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_14.json b/data/directory_mock/2o3y207_14.json
index 6c96d4df9..e90409d9a 100644
--- a/data/directory_mock/2o3y207_14.json
+++ b/data/directory_mock/2o3y207_14.json
@@ -1,27 +1,15 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Honolulu",
-       "state": "Hawaii",
-       "country": "USA"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Honolulu",
+    "state": "Hawaii",
+    "country": "USA"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_15.json b/data/directory_mock/2o3y207_15.json
index 6c96d4df9..e90409d9a 100644
--- a/data/directory_mock/2o3y207_15.json
+++ b/data/directory_mock/2o3y207_15.json
@@ -1,27 +1,15 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Honolulu",
-       "state": "Hawaii",
-       "country": "USA"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Honolulu",
+    "state": "Hawaii",
+    "country": "USA"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_16.json b/data/directory_mock/2o3y207_16.json
index 6c96d4df9..e90409d9a 100644
--- a/data/directory_mock/2o3y207_16.json
+++ b/data/directory_mock/2o3y207_16.json
@@ -1,27 +1,15 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Honolulu",
-       "state": "Hawaii",
-       "country": "USA"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Honolulu",
+    "state": "Hawaii",
+    "country": "USA"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_17.json b/data/directory_mock/2o3y207_17.json
index 6c96d4df9..e90409d9a 100644
--- a/data/directory_mock/2o3y207_17.json
+++ b/data/directory_mock/2o3y207_17.json
@@ -1,27 +1,15 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Honolulu",
-       "state": "Hawaii",
-       "country": "USA"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Honolulu",
+    "state": "Hawaii",
+    "country": "USA"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_18.json b/data/directory_mock/2o3y207_18.json
index 6c96d4df9..e90409d9a 100644
--- a/data/directory_mock/2o3y207_18.json
+++ b/data/directory_mock/2o3y207_18.json
@@ -1,27 +1,15 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Honolulu",
-       "state": "Hawaii",
-       "country": "USA"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Honolulu",
+    "state": "Hawaii",
+    "country": "USA"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_19.json b/data/directory_mock/2o3y207_19.json
index 6c96d4df9..e90409d9a 100644
--- a/data/directory_mock/2o3y207_19.json
+++ b/data/directory_mock/2o3y207_19.json
@@ -1,27 +1,15 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Honolulu",
-       "state": "Hawaii",
-       "country": "USA"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Honolulu",
+    "state": "Hawaii",
+    "country": "USA"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_2.json b/data/directory_mock/2o3y207_2.json
index 6437f9cdf..477c42a48 100644
--- a/data/directory_mock/2o3y207_2.json
+++ b/data/directory_mock/2o3y207_2.json
@@ -1,27 +1,15 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Tuscaluca",
-       "state": "Alabama",
-       "country": "USA"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Tuscaluca",
+    "state": "Alabama",
+    "country": "USA"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_20.json b/data/directory_mock/2o3y207_20.json
index 6c96d4df9..e90409d9a 100644
--- a/data/directory_mock/2o3y207_20.json
+++ b/data/directory_mock/2o3y207_20.json
@@ -1,27 +1,15 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Honolulu",
-       "state": "Hawaii",
-       "country": "USA"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Honolulu",
+    "state": "Hawaii",
+    "country": "USA"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_3.json b/data/directory_mock/2o3y207_3.json
index 4a44910c7..83fdfcf87 100644
--- a/data/directory_mock/2o3y207_3.json
+++ b/data/directory_mock/2o3y207_3.json
@@ -1,26 +1,14 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Brazilia",
-       "country": "Brazil"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Brazilia",
+    "country": "Brazil"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_4.json b/data/directory_mock/2o3y207_4.json
index cfb9c9ff3..0c65e8e5e 100644
--- a/data/directory_mock/2o3y207_4.json
+++ b/data/directory_mock/2o3y207_4.json
@@ -1,26 +1,14 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Sao Paolo",
-       "country": "Brazil"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Sao Paolo",
+    "country": "Brazil"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_5.json b/data/directory_mock/2o3y207_5.json
index 8b8055cdf..40f19f58d 100644
--- a/data/directory_mock/2o3y207_5.json
+++ b/data/directory_mock/2o3y207_5.json
@@ -1,26 +1,14 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Addis Ababa",
-       "country": "Ethiopia"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Addis Ababa",
+    "country": "Ethiopia"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_6.json b/data/directory_mock/2o3y207_6.json
index 8063fdf0c..68750664d 100644
--- a/data/directory_mock/2o3y207_6.json
+++ b/data/directory_mock/2o3y207_6.json
@@ -1,26 +1,14 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Kyiv",
-       "country": "Ukraine"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Kyiv",
+    "country": "Ukraine"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_7.json b/data/directory_mock/2o3y207_7.json
index 7af2d1a5a..2007322e8 100644
--- a/data/directory_mock/2o3y207_7.json
+++ b/data/directory_mock/2o3y207_7.json
@@ -1,26 +1,14 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Tokyo",
-       "country": "Japan"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Tokyo",
+    "country": "Japan"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_8.json b/data/directory_mock/2o3y207_8.json
index d34396e16..5d654de3d 100644
--- a/data/directory_mock/2o3y207_8.json
+++ b/data/directory_mock/2o3y207_8.json
@@ -1,26 +1,14 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Hongkong",
-       "country": "Hongkong"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Hongkong",
+    "country": "Hongkong"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/2o3y207_9.json b/data/directory_mock/2o3y207_9.json
index 6c96d4df9..e90409d9a 100644
--- a/data/directory_mock/2o3y207_9.json
+++ b/data/directory_mock/2o3y207_9.json
@@ -1,27 +1,15 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {"city": "Honolulu",
-       "state": "Hawaii",
-       "country": "USA"
-      }
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {
+    "city": "Honolulu",
+    "state": "Hawaii",
+    "country": "USA"
+  },
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/3120871.json b/data/directory_mock/3120871.json
index 11696a956..d97c86d83 100644
--- a/data/directory_mock/3120871.json
+++ b/data/directory_mock/3120871.json
@@ -1,24 +1,11 @@
 {
-    "name": "Jane Doe",
-    "honorific": "",
-    "categories": [],
-    "title": "Data afficionado",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "",
-    "logo_url": "",
-    "location": [
-      {}
-    ],
-    "social_media": [
-      {}
-    ],
-    "interests": [],
-    "contact_method": [],
-    "activities": [
-      {}
-    ],
-    "last_updated": "2021-01-01"
-  }
-  
\ No newline at end of file
+  "name": "Jane Doe",
+  "location": {},
+  "social_media": {},
+  "activities": {},
+  "last_updated": "2021-01-01",
+  "work": {
+    "title": "Data afficionado"
+  },
+  "photo": {}
+}
diff --git a/data/directory_mock/8324592.json b/data/directory_mock/8324592.json
index cc9b5342d..80d73556e 100644
--- a/data/directory_mock/8324592.json
+++ b/data/directory_mock/8324592.json
@@ -1,28 +1,22 @@
 {
-    "name": "Maëlle  Salmon",
-    "honorific": "Dr.",
-    "categories": ["France", "Speaker"],
-    "title": "Data scientist",
-    "organization": "",
-    "department": "",
-    "notes": "",
-    "photo_url": "https://rladies.org/wp-content/uploads/connections-images/maille-salmon/Maelle.jpg",
-    "logo_url": "",
-    "location": [
-      {
-        "city": "Nancy",
-        "country": "France"
-      }
-    ],
-    "social_media": [
-      {
-        "twitter": "ma_salmon",
-        "website": "http://www.masalmon.eu/"
-      }
-    ],
-    "interests": ["R in Research", "Reproducible Analyses", "Open Science and Open Data", "Statistics", "epidemiology", "Public Health", "R Blogging"],
-    "contact_method": ["Twitter"],
-    "activities": [
-      {}
-    ]
-  }
\ No newline at end of file
+  "name": "Maëlle  Salmon",
+  "honorific": "Dr.",
+  "categories": ["France", "Speaker"],
+  "location": {
+    "city": "Nancy",
+    "country": "France"
+  },
+  "social_media": {
+    "twitter": "ma_salmon",
+    "website": "http://www.masalmon.eu/"
+  },
+  "interests": ["R in Research", "Reproducible Analyses", "Open Science and Open Data", "Statistics", "epidemiology", "Public Health", "R Blogging"],
+  "contact_method": ["Twitter"],
+  "activities": {},
+  "work": {
+    "title": "Data scientist"
+  },
+  "photo": {
+    "url": "https://rladies.org/wp-content/uploads/connections-images/maille-salmon/Maelle.jpg"
+  }
+}
diff --git a/data/global_team/alumni/alice_daish.json b/data/global_team/alumni/alice_daish.json
index 28f008cee..c1c49263f 100644
--- a/data/global_team/alumni/alice_daish.json
+++ b/data/global_team/alumni/alice_daish.json
@@ -1,7 +1,11 @@
-  {
-    "name": "Alice Daish",
-    "role": [" Leadership Team"],
-    "start": "July 2016",
-    "end": "2018",
-    "img": "alice_daish.png"
+{
+  "name": "Alice Daish",
+  "role": [
+    " Leadership Team"
+  ],
+  "start": "July 2016",
+  "end": "2018",
+  "img": {
+    "url": "alice_daish.png"
   }
+}
diff --git a/data/global_team/alumni/chiinrui_tan.json b/data/global_team/alumni/chiinrui_tan.json
index 8bef89b13..3e29688f5 100644
--- a/data/global_team/alumni/chiinrui_tan.json
+++ b/data/global_team/alumni/chiinrui_tan.json
@@ -1,7 +1,11 @@
-  {
-    "name": "Chiin-Rui Tan",
-    "role": [" Leadership Team"],
-    "start": "July 2016",
-    "end": "May 2017",
-    "img": "chiinrui_tan.png"
+{
+  "name": "Chiin-Rui Tan",
+  "role": [
+    " Leadership Team"
+  ],
+  "start": "July 2016",
+  "end": "May 2017",
+  "img": {
+    "url": "chiinrui_tan.png"
   }
+}
diff --git a/data/global_team/alumni/gabriela_de_queiroz.json b/data/global_team/alumni/gabriela_de_queiroz.json
index 210fbb1b6..a1baac6fb 100644
--- a/data/global_team/alumni/gabriela_de_queiroz.json
+++ b/data/global_team/alumni/gabriela_de_queiroz.json
@@ -1,7 +1,11 @@
-  {
-    "name": "Gabriela de Queiroz",
-    "role": [" Leadership Team"],
-    "start": "July 2016",
-    "end": "2019",
-    "img": "gabriela_de_queiroz.png"
+{
+  "name": "Gabriela de Queiroz",
+  "role": [
+    " Leadership Team"
+  ],
+  "start": "July 2016",
+  "end": "2019",
+  "img": {
+    "url": "gabriela_de_queiroz.png"
   }
+}
diff --git a/data/global_team/alumni/jesse_mostipak.json b/data/global_team/alumni/jesse_mostipak.json
index 7ec5fdc22..7d6f76d38 100644
--- a/data/global_team/alumni/jesse_mostipak.json
+++ b/data/global_team/alumni/jesse_mostipak.json
@@ -1,7 +1,11 @@
-  {
-    "name": "Jesse Mostipak",
-    "role": [" Onboarding"],
-    "start": "Feb. 2020",
-    "end": "May 2020",
-    "img": "jesse_mostipak.png"
+{
+  "name": "Jesse Mostipak",
+  "role": [
+    " Onboarding"
+  ],
+  "start": "Feb. 2020",
+  "end": "May 2020",
+  "img": {
+    "url": "jesse_mostipak.png"
   }
+}
diff --git a/data/global_team/alumni/rachel_kirkham.json b/data/global_team/alumni/rachel_kirkham.json
index 11cb6c6f1..800b2a156 100644
--- a/data/global_team/alumni/rachel_kirkham.json
+++ b/data/global_team/alumni/rachel_kirkham.json
@@ -1,7 +1,11 @@
-  {
-    "name": "Rachel Kirkham",
-    "role": [" Leadership Team"],
-    "start": "July 2016",
-    "end": "Dec. 2016",
-    "img": "rachel_kirkham.png"
+{
+  "name": "Rachel Kirkham",
+  "role": [
+    " Leadership Team"
+  ],
+  "start": "July 2016",
+  "end": "Dec. 2016",
+  "img": {
+    "url": "rachel_kirkham.png"
   }
+}
diff --git "a/data/global_team/alumni/sina_r\303\274eger.json" "b/data/global_team/alumni/sina_r\303\274eger.json"
index 01c28537a..821a035a0 100644
--- "a/data/global_team/alumni/sina_r\303\274eger.json"
+++ "b/data/global_team/alumni/sina_r\303\274eger.json"
@@ -1,7 +1,11 @@
-  {
-    "name": "Sina Rüeger",
-    "role": [" Community Slack"],
-    "start": "March 2018",
-    "end": "May 2020",
-    "img": "sina_rüeger.png"
+{
+  "name": "Sina Rüeger",
+  "role": [
+    " Community Slack"
+  ],
+  "start": "March 2018",
+  "end": "May 2020",
+  "img": {
+    "url": "sina_rueger.png"
   }
+}
diff --git a/data/global_team/current/athanasia_monika_mowinckel.json b/data/global_team/current/athanasia_monika_mowinckel.json
index dafce5b87..f7c7451d6 100644
--- a/data/global_team/current/athanasia_monika_mowinckel.json
+++ b/data/global_team/current/athanasia_monika_mowinckel.json
@@ -1,6 +1,12 @@
-  {
-    "name": "Athanasia Monika Mowinckel",
-    "role": ["Website", " YouTube"],
-    "start": "Oct. 2019",
-    "img": "athanasia_monika_mowinckel.png"
+{
+  "name": "Athanasia Monika Mowinckel",
+  "role": [
+    "Website",
+    "YouTube"
+  ],
+  "start": "Oct. 2019",
+  "img": {
+    "url": "athanasia_monika_mowinckel.png",
+    "credit": "Tron Tronsdal"
   }
+}
diff --git a/data/global_team/current/batool_almarzouq.json b/data/global_team/current/batool_almarzouq.json
index d290644ea..44496f4f1 100644
--- a/data/global_team/current/batool_almarzouq.json
+++ b/data/global_team/current/batool_almarzouq.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Batool Almarzouq",
-    "role": ["RUGS grant administration"],
-    "start": "April 2021",
-    "img": "batool_almarzouq.png"
+{
+  "name": "Batool Almarzouq",
+  "role": [
+    "RUGS grant administration"
+  ],
+  "start": "April 2021",
+  "img": {
+    "url": "batool_almarzouq.png"
   }
+}
diff --git a/data/global_team/current/bea_hernandez.json b/data/global_team/current/bea_hernandez.json
index 6bdc65540..0c9ec06f5 100644
--- a/data/global_team/current/bea_hernandez.json
+++ b/data/global_team/current/bea_hernandez.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Bea Hernández",
-    "role": ["Community Slack"],
-    "start": "2017",
-    "img": "bea_hernandez.png"
+{
+  "name": "Bea Hernández",
+  "role": [
+    "Community Slack"
+  ],
+  "start": "2017",
+  "img": {
+    "url": "bea_hernandez.png"
   }
+}
diff --git a/data/global_team/current/christin_zasada.json b/data/global_team/current/christin_zasada.json
index 63f850162..07ac976a1 100644
--- a/data/global_team/current/christin_zasada.json
+++ b/data/global_team/current/christin_zasada.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Christin Zasada",
-    "role": ["Blog"],
-    "start": "Sept. 2019",
-    "img": "christin_zasada.png"
+{
+  "name": "Christin Zasada",
+  "role": [
+    "Blog"
+  ],
+  "start": "Sept. 2019",
+  "img": {
+    "url": "christin_zasada.png"
   }
+}
diff --git a/data/global_team/current/claudia_vitolo.json b/data/global_team/current/claudia_vitolo.json
index b9cc97437..fd956a64f 100644
--- a/data/global_team/current/claudia_vitolo.json
+++ b/data/global_team/current/claudia_vitolo.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Claudia Vitolo",
-    "role": ["Leadership Team"],
-    "start": "July 2016",
-    "img": "claudia_vitolo.png"
+{
+  "name": "Claudia Vitolo",
+  "role": [
+    "Leadership Team"
+  ],
+  "start": "July 2016",
+  "img": {
+    "url": "claudia_vitolo.png"
   }
+}
diff --git a/data/global_team/current/erin_ledell.json b/data/global_team/current/erin_ledell.json
index a2c0f9662..6c6b4b940 100644
--- a/data/global_team/current/erin_ledell.json
+++ b/data/global_team/current/erin_ledell.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Erin LeDell",
-    "role": ["Leadership Team"],
-    "start": "July 2016",
-    "img": "erin_ledell.png"
+{
+  "name": "Erin LeDell",
+  "role": [
+    "Leadership Team"
+  ],
+  "start": "July 2016",
+  "img": {
+    "url": "erin_ledell.png"
   }
+}
diff --git a/data/global_team/current/florencia_dandrea.json b/data/global_team/current/florencia_dandrea.json
index 83bf18b58..dd74404a7 100644
--- a/data/global_team/current/florencia_dandrea.json
+++ b/data/global_team/current/florencia_dandrea.json
@@ -1,6 +1,11 @@
-  {
-    "name": "Florencia D’Andrea",
-    "role": ["Community Slack", " Chapter Mentoring"],
-    "start": "2018",
-    "img": "florencia_dandrea.png"
+{
+  "name": "Florencia D’Andrea",
+  "role": [
+    "Community Slack",
+    " Chapter Mentoring"
+  ],
+  "start": "2018",
+  "img": {
+    "url": "florencia_dandrea.png"
   }
+}
diff --git a/data/global_team/current/hannah_frick.json b/data/global_team/current/hannah_frick.json
index 9acdf45e4..a99239fe3 100644
--- a/data/global_team/current/hannah_frick.json
+++ b/data/global_team/current/hannah_frick.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Hannah Frick",
-    "role": ["Leadership Team"],
-    "start": "July 2016",
-    "img": "hannah_frick.png"
+{
+  "name": "Hannah Frick",
+  "role": [
+    "Leadership Team"
+  ],
+  "start": "July 2016",
+  "img": {
+    "url": "hannah_frick.png"
   }
+}
diff --git a/data/global_team/current/jennifer_thompson.json b/data/global_team/current/jennifer_thompson.json
index 707918e43..a1cf17cbb 100644
--- a/data/global_team/current/jennifer_thompson.json
+++ b/data/global_team/current/jennifer_thompson.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Jennifer Thompson",
-    "role": ["Abstract Review System"],
-    "start": "May 2017",
-    "img": "jennifer_thompson.png"
+{
+  "name": "Jennifer Thompson",
+  "role": [
+    "Abstract Review System"
+  ],
+  "start": "May 2017",
+  "img": {
+    "url": "jennifer_thompson.png"
   }
+}
diff --git a/data/global_team/current/katherine_simeon.json b/data/global_team/current/katherine_simeon.json
index 64cd7a266..b51596876 100644
--- a/data/global_team/current/katherine_simeon.json
+++ b/data/global_team/current/katherine_simeon.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Katherine Simeon",
-    "role": ["RoCur Twitter Account"],
-    "start": "July 2019",
-    "img": "katherine_simeon.png"
+{
+  "name": "Katherine Simeon",
+  "role": [
+    "RoCur Twitter Account"
+  ],
+  "start": "July 2019",
+  "img": {
+    "url": "katherine_simeon.png"
   }
+}
diff --git a/data/global_team/current/laura_acion.json b/data/global_team/current/laura_acion.json
index 2d8deb010..ec755c91a 100644
--- a/data/global_team/current/laura_acion.json
+++ b/data/global_team/current/laura_acion.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Laura Acion",
-    "role": ["Leadership Team"],
-    "start": "July 2016",
-    "img": "laura_acion.png"
+{
+  "name": "Laura Acion",
+  "role": [
+    "Leadership Team"
+  ],
+  "start": "July 2016",
+  "img": {
+    "url": "laura_acion.png"
   }
+}
diff --git a/data/global_team/current/maelle_salmon.json b/data/global_team/current/maelle_salmon.json
index 3ceca62dc..3584461b6 100644
--- a/data/global_team/current/maelle_salmon.json
+++ b/data/global_team/current/maelle_salmon.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Maëlle Salmon",
-    "role": ["Global Twitter Account"],
-    "start": "2017",
-    "img": "maelle_salmon.png"
+{
+  "name": "Maëlle Salmon",
+  "role": [
+    "Global Twitter Account"
+  ],
+  "start": "2017",
+  "img": {
+    "url": "maelle_salmon.png"
   }
+}
diff --git a/data/global_team/current/mouna_belaid.json b/data/global_team/current/mouna_belaid.json
index bc903cb30..c7f532bd8 100644
--- a/data/global_team/current/mouna_belaid.json
+++ b/data/global_team/current/mouna_belaid.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Mouna Belaid",
-    "role": ["Onboarding"],
-    "start": "April 2021",
-    "img": "mouna_belaid.png"
+{
+  "name": "Mouna Belaid",
+  "role": [
+    "Onboarding"
+  ],
+  "start": "April 2021",
+  "img": {
+    "url": "mouna_belaid.png"
   }
+}
diff --git a/data/global_team/current/nadeja_sero.json b/data/global_team/current/nadeja_sero.json
index 293ff7c59..4654a3f18 100644
--- a/data/global_team/current/nadeja_sero.json
+++ b/data/global_team/current/nadeja_sero.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Nadejda Sero",
-    "role": ["Chapter Mentoring"],
-    "start": "May 2020",
-    "img": "nadeja_sero.png"
+{
+  "name": "Nadejda Sero",
+  "role": [
+    "Chapter Mentoring"
+  ],
+  "start": "May 2020",
+  "img": {
+    "url": "nadeja_sero.png"
   }
+}
diff --git a/data/global_team/current/noa_tamir.json b/data/global_team/current/noa_tamir.json
index 19f0065f3..34296e312 100644
--- a/data/global_team/current/noa_tamir.json
+++ b/data/global_team/current/noa_tamir.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Noa Tamir",
-    "role": ["CoC Enforcement Support"],
-    "start": "March 2020",
-    "img": "noa_tamir.png"
+{
+  "name": "Noa Tamir",
+  "role": [
+    "CoC Enforcement Support"
+  ],
+  "start": "March 2020",
+  "img": {
+    "url": "noa_tamir.png"
   }
+}
diff --git a/data/global_team/current/page_piccinini.json b/data/global_team/current/page_piccinini.json
index e2a9b1f62..54c01ec70 100644
--- a/data/global_team/current/page_piccinini.json
+++ b/data/global_team/current/page_piccinini.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Page Piccinini",
-    "role": ["Directory"],
-    "start": "2017",
-    "img": "page_piccinini.png"
+{
+  "name": "Page Piccinini",
+  "role": [
+    "Directory"
+  ],
+  "start": "2017",
+  "img": {
+    "url": "page_piccinini.png"
   }
+}
diff --git a/data/global_team/current/patricia_a_loto.json b/data/global_team/current/patricia_a_loto.json
index 40cd4cf41..7c5c7e2f4 100644
--- a/data/global_team/current/patricia_a_loto.json
+++ b/data/global_team/current/patricia_a_loto.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Patricia A. Loto",
-    "role": ["Meetup Pro"],
-    "start": "May 2020",
-    "img": "patricia_a_loto.png"
+{
+  "name": "Patricia A. Loto",
+  "role": [
+    "Meetup Pro"
+  ],
+  "start": "May 2020",
+  "img": {
+    "url": "patricia_a_loto.png"
   }
+}
diff --git a/data/global_team/current/saranjeet_kaur_bhogal.json b/data/global_team/current/saranjeet_kaur_bhogal.json
index 973d5b228..1c48da607 100644
--- a/data/global_team/current/saranjeet_kaur_bhogal.json
+++ b/data/global_team/current/saranjeet_kaur_bhogal.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Saranjeet Kaur Bhogal",
-    "role": ["Chapter Activity"],
-    "start": "April 2020",
-    "img": "saranjeet_kaur_bhogal.png"
+{
+  "name": "Saranjeet Kaur Bhogal",
+  "role": [
+    "Chapter Activity"
+  ],
+  "start": "April 2020",
+  "img": {
+    "url": "saranjeet_kaur_bhogal.png"
   }
+}
diff --git a/data/global_team/current/sheila_saia.json b/data/global_team/current/sheila_saia.json
index e9fba992a..c33a89dc9 100644
--- a/data/global_team/current/sheila_saia.json
+++ b/data/global_team/current/sheila_saia.json
@@ -1,6 +1,10 @@
-  {
-    "name": "Sheila Saia",
-    "role": ["Directory"],
-    "start": "",
-    "img": "sheila_saia.png"
+{
+  "name": "Sheila Saia",
+  "role": [
+    "Directory"
+  ],
+  "start": "",
+  "img": {
+    "url": "sheila_saia.png"
   }
+}
diff --git a/data/global_team/current/yanina_bellini_saibene.json b/data/global_team/current/yanina_bellini_saibene.json
index 5f79846b0..694538b76 100644
--- a/data/global_team/current/yanina_bellini_saibene.json
+++ b/data/global_team/current/yanina_bellini_saibene.json
@@ -1,6 +1,12 @@
-  {
-    "name": "Yanina Bellini Saibene",
-    "role": ["Conferences liaison and Metameetups", " IWD Campaign", " Educational materials"],
-    "start": "2018",
-    "img": "yanina_bellini_saibene.png"
+{
+  "name": "Yanina Bellini Saibene",
+  "role": [
+    "Conferences liaison and Metameetups",
+    " IWD Campaign",
+    " Educational materials"
+  ],
+  "start": "2018",
+  "img": {
+    "url": "yanina_bellini_saibene.png"
   }
+}
diff --git a/layouts/shortcodes/blogdown/postref.html b/layouts/shortcodes/blogdown/postref.html
new file mode 100644
index 000000000..858ad3ec3
--- /dev/null
+++ b/layouts/shortcodes/blogdown/postref.html
@@ -0,0 +1 @@
+{{ if eq (getenv "HUGO_BLOGDOWN_POST_RELREF") "true" }}{{ .Page.RelPermalink }}{{ else }}{{ .Page.Permalink }}{{ end }}
\ No newline at end of file
diff --git a/scripts/generate_token.R b/scripts/generate_token.R
deleted file mode 100644
index f9889b5b5..000000000
--- a/scripts/generate_token.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generate new token for meetupr auth
-token_path <- "~/.rladies_meetup_token.rds"
-usethis::use_build_ignore(token_path)
-usethis::use_git_ignore(token_path)
-
-meetupr::meetup_auth(
-  token = NULL,
-  cache = TRUE,
-  use_appdir = FALSE,
-  token_path = token_path
-)
-
-sodium_key <- sodium::keygen()
-
-# save an environment secret in the repo
-# "MEETUPR_PWD" = sodium::bin2hex(sodium_key)
-
-# key <- cyphr::key_sodium(sodium::hex2bin(sodium::bin2hex(sodium_key)))
-
-cyphr::encrypt_file(
-  token_path,
-  key = key,
-  dest = "scripts/secret.rds"
-)
diff --git a/scripts/get_chapters.R b/scripts/get_chapters.R
deleted file mode 100644
index dc25f7a1a..000000000
--- a/scripts/get_chapters.R
+++ /dev/null
@@ -1,54 +0,0 @@
-
-source(here::here("scripts/utils.R"))
-pkgs <- sapply(c("meetupr", "dplyr"), load_lib)
-
-cat("Retrieving R-Ladies group information\n")
-# Better than getting pro groups, because we want timezone...
-rladies_groups <- find_groups("r-ladies") |> 
-  #filter(name == "R-Ladies Global") |> 
-  mutate(country_acronym = country) |> 
-  select(-country) |> 
-  distinct()
-
-chapters <- read.table(
-  "https://raw.githubusercontent.com/rladies/starter-kit/master/Current-Chapters.csv", 
-  sep = ",", header = TRUE, stringsAsFactors = FALSE) |>
-  as_tibble() |> 
-  mutate(urlname = basename(Meetup))  |> 
-  select(-State.Region, -City, -Current_Organizers) |> 
-  select(urlname, Status, Country, everything()) |> 
-  mutate(across(-all_of(c("Website", "Slack")), basename)) |> 
-  mutate(across(where(is.character), change_empty)) |> 
-  rename_all(tolower) |> 
-  mutate(github = paste0("rladies/", github))
-
-some_cols <- names(chapters)[-1:-3]
-
-# Create chapters json
-to_file <- chapters |> 
-  left_join(rladies_groups, by="urlname") |> 
-  nest_by(across(-all_of(some_cols)), .key = "social_media") |> 
-  ungroup() |> 
-  transmute(name, 
-            id,
-            urlname,
-            country,
-            state, 
-            city,
-            members,
-            status,
-            lat = latitude,
-            lon = longitude,
-            timezone,
-            status_text = status,
-            status = ifelse(grepl("Retired", status),
-                            "retired", tolower(status)),
-            social_media = lapply(social_media, na_col_rm) 
-  ) |> 
-  filter(status == "active") |> 
-  nest_by(country, .key = "chapters")
-
-cat("\t writing 'data/chapters.json'\n")
-jsonlite::write_json(to_file, 
-                     here::here("data/chapters.json"),
-                     pretty = TRUE)
diff --git a/scripts/get_events.R b/scripts/get_events.R
deleted file mode 100644
index 96bc19e1b..000000000
--- a/scripts/get_events.R
+++ /dev/null
@@ -1,89 +0,0 @@
-source(here::here("scripts/utils.R"))
-
-pkgs <- sapply(c("meetupr","tidyr", "dplyr", "lubridate"),
-               load_lib)
-
-# grab upcoming events
-get_events_pb <- function(x){
-  cat(x , sep="\n")
-  k <- get_events(x)
-  if(!is.null(k)){
-    k$id <- as.character(k$id)
-  }
-  k$urlname <- x
-  k
-}
-
-## Get events ----
-cat("Retrieving R-Ladies group information\n")
-rladies_groups <- jsonlite::read_json(
-  here::here("data/chapters.json"), 
-  simplifyVector = TRUE
-) |> 
-  unnest(chapters) |> 
-  filter(status == "active",
-         !is.na(urlname)) |> 
-  transmute(group = name,
-         urlname,
-         chapter_id = id,
-         lat, 
-         lon, 
-         timezone)
-  
-
-cat("\n\n Downloading chapter events\n")
-new_events <- lapply(rladies_groups$urlname, get_events_pb) 
-new_events_df <-  new_events |> 
-  bind_rows() |> 
-  filter(status %in% c("published"))
-
-# Read in existing json data
-existing_events <- jsonlite::read_json(
-  here::here("data/events.json"), 
-  simplifyVector = TRUE
-) |> 
-  filter(!id %in% new_events$id) |> 
-  mutate(chapter_id = as.character(chapter_id))
-
-
-# Create df for json
-events <- new_events_df |> 
-  left_join(rladies_groups) |>
-  transmute(
-    id,
-    chapter_id,
-    title = title, 
-    body = sprintf(
-      "<h3 class='entry-title'>%s<h3><i class='fa fa-users'></i>&emsp;%s<br><br>%s...  <br><br><center><a href='%s' target='_blank'><button class='btn btn-primary'>Event page</button></center></a>", 
-      title,
-      going,
-      substr(description, 1, 300),
-      link),
-    start = as.character(force_tz(time, "UTC")),
-    ds = lubridate::as.duration(duration), 
-    end = as.character(time + (ds %||% lubridate::dhours(2))),
-    date = format(new_events$time, "%Y-%m-%d"),
-    location = ifelse(
-      is.na(venue_name), "Not announced",
-      paste(venue_name, venue_address %||% "", venue_city %||% "", toupper(venue_country) %||% "", sep=", ")),
-    location = gsub(", , |, $", "", location),
-    type = status,
-    lat = venue_lat %||% lat,
-    lon = venue_lon %||% lon,
-    description
-  ) |>  
-  select(-ds) |>
-  bind_rows(existing_events) |>
-  distinct()
-
-cat("\t writing 'data/events.json'\n")
-jsonlite::write_json(x = events, 
-                     path = here::here("data/events.json"),
-                     pretty = TRUE)
-
-cat("Writing 'data/events_updated.json'\n")
-jsonlite::write_json(x = data.frame(date = Sys.time(),
-                                    n_events_past = filter(events, type  == "past") |> nrow(),
-                                    n_chapters = nrow(rladies_groups)), 
-                     path = here::here("data/events_updated.json"),
-                     pretty = TRUE)
diff --git a/scripts/meetup_auth.R b/scripts/meetup_auth.R
deleted file mode 100644
index 0070684a5..000000000
--- a/scripts/meetup_auth.R
+++ /dev/null
@@ -1,20 +0,0 @@
-cat("Session is non-interactive. Starting meetup authentication process.\n")
-
-key <- cyphr::key_sodium(sodium::hex2bin(Sys.getenv("MEETUPR_PWD")))
-temptoken <- tempfile(fileext = ".rds")
-cyphr::decrypt_file(
-  here::here("scripts/secret.rds"),
-  key = key,
-  dest = temptoken
-)
-
-token <- readRDS(temptoken)[[1]]
-token <- meetupr::meetup_auth(
-  token = temptoken,
-  cache = FALSE
-) 
-
-Sys.setenv(MEETUPR_PAT = temptoken)
-
-cat("\t authenticating...\n\n")
-k <- meetupr::meetup_auth(token = temptoken)
diff --git a/scripts/secret.rds b/scripts/secret.rds
deleted file mode 100644
index e1ff54970..000000000
Binary files a/scripts/secret.rds and /dev/null differ
diff --git a/themes/hugo-rladies/assets/style.scss b/themes/hugo-rladies/assets/style.scss
index e35c212b9..9d2b3ca0c 100644
--- a/themes/hugo-rladies/assets/style.scss
+++ b/themes/hugo-rladies/assets/style.scss
@@ -82,14 +82,24 @@ html {
 
 .full-width {
    width: 100vw;
-   position: relative;
-   left: 50%;  
+   left: 50%;
    margin-left: -50vw;
+   padding-left: .2rem;
+   position: relative;
+
    ul{
     width: 100%;
   }
 }
 
+/* Large Devices, Wide Screens */
+@media only screen and (min-width : 1200px) {
+.full-width {
+   width: 1200px;
+   margin-left: -600px;
+  }
+}
+
 .post {
   width: 100%;
 
@@ -215,6 +225,8 @@ pre.chroma {
   border-radius: 10px;
 }
 
+
+
 /******************/
 /* custom styles  */
 /******************/
@@ -229,17 +241,6 @@ pre.chroma {
   letter-spacing: 1px;
   color: darken($secondary, 30%);
   font-family: $font-family-sans-serif
-  
-  a {
-    color: darken($secondary, 30%) !important;
-  }
-  
-  :target:before {
-    content: "";
-    display: block;
-    height: 100px;
-    margin: 0 0 0;
-  }
 
 }
 
@@ -250,6 +251,7 @@ pre.chroma {
 
 .section-title span,
 .entry-title span {
+  color: $gray-700;
   display: inline-block;
   position: relative;
 }
@@ -328,35 +330,44 @@ pre {
 /* parallax Hero  */
 /******************/
 .paral {
-  background-attachment: fixed;
-  background-position: 50% 50%;
+  background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
-  
+  height: 200px;
+
   a {
     font-size: 24px;
     text-align: center;
     line-height: 60px;
   }
 
-  .chevron {
-    color: rgba(lighten($primary, 40%), .6);
-  }
-  
   .logo img{
     position: absolute;
     display: block;
     left: 0;
     right: 0;
-  
+    top: 4vh;
+
     margin: auto; 
     height: 100px;
     width: 100px;
     border-radius: 20px;
     opacity: 1;
   }
+}
+
+.home { 
+  height: 100vh;
   
-  .logo .home img {
+  .paral {
+    background-attachment: none;
+  }
+  
+  .chevron {
+    color: rgba(lighten($primary, 40%), .6);
+  }
+  
+  .logo img {
     bottom: 0;
     top: 0;
     height: 200px;
@@ -364,6 +375,29 @@ pre {
   }
 }
 
+/******************/
+/*   object-fit   */
+/******************/
+
+.obj-fit-fill {
+  object-fit: fill;
+}
+
+.obj-fit-cover {
+  object-fit: cover;
+}
+
+.obj-fit-contain {
+  object-fit: contain;
+}
+
+.obj-fit-sd {
+  object-fit: scale-down;
+}
+
+.obj-fit-none {
+  object-fit: none;
+}
 
 /******************/
 /*   object-fit   */
@@ -393,14 +427,9 @@ pre {
 /******************/
 /*      cards     */
 /******************/
-.embed-responsive .card-img-top {
-    object-fit: cover;
-}
 
 .card {
   .card-img-rladies {
-      width: 50px !important;
-      height: 50px !important;
       object-fit: contain;
   }
   
@@ -414,65 +443,192 @@ pre {
   background-color: rgba($black, .7);
 }
   
-.card-directory {
-  max-width: 300px; ¨
-  :target:before {
-    content: "";
-    display: block;
-    height: 400px;
-    margin: -400px 0 0;
+  .card-directory {
+    max-width: 300px;
+    :target:before {
+      content: "";
+      display: block;
+      height: 400px;
+      margin: -400px 0 0;
+    }
+  }
+  
+  .card-header-rladies{
+    background-color: $primary;
+    color: $white;
+  }
+  .card-directory-text {
+    font-size: 16px;
+  }
+  
+  .card-img-transp {
+    background-color: rgba($black, .7);
+  }
+  
+  .card-footer {
+    background-color: lighten($primary, 50%);
+    text-align: right;
+    small {
+      color: $gray-900;
+    }
+  }
+  
+  .card-title {
+    color: $primary;
+    font-family: $font-family-sans-serif;
+    
+    a {
+      color: $secondary;
+    }
+  }
+   
+    
+  .card-text{
+    font-size: $font-size-base * .8;
+  }
+  
+  .card-directory-title{
+    font-size: 3em; 
+    display: inline-block; 
+    font-size: $font-size-base;
+    p {
+      margin: 0;
+      padding: 0;
+    }
+    a {
+      font-size: $font-size-base * 1.75;
+    }
+  }
+  
+  .card-home {
+    max-height: 100px;
+  }
+
+
+/* hover-img  */
+.card-grid-hover {
+  overflow: hidden;
+  position: relative;
+  padding-bottom: 60%;
+  
+ img {
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    transition: all 0.3s;
+  }
+  
+  h4 {
+    font-size: 1.25rem;
+  }
+  
+  p {
+    font-size: 0.8rem;
   }
 }
 
-.card-header-rladies{
-  background-color: $primary;
-  color: $white;
+.card-grid-hover-overlay {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 90;
+  transition: all 0.4s;
 }
-.card-directory-text {
-  font-size: 16px;
+
+.card-grid-hover-content {
+  position: relative;
+  z-index: 99;
 }
 
-.bottom-align-text {
-  position: absolute;
-  bottom: 0;
-  right: 0;
+.card-grid-hover-img{
+ .card-grid-hover-overlay {
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 90;
+  }
+  img {
+    width: 110%;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
 }
 
-.card-footer {
-  background-color: lighten($primary, 50%);
+.card-grid-hover-img-title,
+.card-grid-hover-img-subtitle {
+  position: absolute;
+  bottom: 0.5rem;
+  right: 0;
+  padding: 1rem;
+  padding-bottom:.2rem;
+  z-index: 99;
   text-align: right;
-  small {
-    color: $gray-900;
-  }
+  
+
 }
 
-.card-title {
-  color: $primary;
-  font-family: $font-family-sans-serif;
+
+.card-grid-hover-img-subtitle {
+  opacity: 0;
 }
- 
-.page-item, .page-link {
-  border: none; 
+
+.card-grid-hover-img-description {
+  position: absolute;
+  top: 20% ;
+  left: 10%;
+  text-align: right;
+  border-right: 3px solid #fff;
+  padding: 1rem;
+  padding-top:.2rem;
+  z-index: 99;
+  transform: translateX(-1.5rem);
+  opacity: 0;
+  width: 60%;
+  transition: all 0.3s;
 }
 
-.card-text{
-  font-size: $font-size-base * .8;
+.card-grid-hover-img:hover::after {
+  opacity: 1;
+  transform: none;
 }
 
-.card-directory-title{
-  font-size: 3em; 
-  display: inline-block; 
-  font-size: $font-size-base;
-  p {
-    margin: 0;
-    padding: 0;
+.card-grid-hover-img:hover{
+  .card-grid-hover-img-description,
+  .card-grid-hover-img-subtitle {
+    opacity: 1;
+    transform: none;
   }
-  a {
-    font-size: $font-size-base * 1.75;
+  
+   img {
+    width: 100%;
+  }
+  
+ .card-grid-hover-img-title {
+    opacity: 0;
+    transform: none;
+  }
+  
+ .card-grid-hover-overlay {
+    background: rgba(0, 0, 0, 0.8);
   }
 }
 
 
+.bottom-align-text {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+}
+
+
+.page-item, .page-link {
+  border: none; 
+}
+
+
+
 .expand-grid{
   ul{
     list-style-type: none;
@@ -538,6 +694,10 @@ pre {
 .card-expand-title {
   color: $secondary;
   text-transform: uppercase;
+  
+  a {
+    color: darken($secondary, 20%);
+  }
 }
 
 .card-expand:hover,
@@ -610,9 +770,10 @@ pre {
   text-transform: uppercase;
 }
 
-.card-expand-meta {
-  margin-top: 0.8rem;
-  font-size: 12px;
+.card-expand-foot{
+  margin-top: 0.5rem;
+  margin-bottom: -10px;
+  font-size: 11px;
   color: $secondary;
    a {
     text-decoration: none;
@@ -637,9 +798,6 @@ pre {
   color: lighten($primary, 20%);
 }
 
-.card-home {
-  max-height: 100px;
-}
 
 
 /******************/
@@ -810,3 +968,14 @@ tr.fc-list-event {
   margin-left: 0;
   margin-right: 0;
 }
+
+
+
+.page-arrow {
+  font-size:20px;
+  line-height:1;
+  font-weight:bold;
+  cursor:pointer;
+  background:$table-hover-bg;
+  padding:5px 10px;
+}
diff --git a/themes/hugo-rladies/i18n/en.toml b/themes/hugo-rladies/i18n/en.toml
index 74530b49a..ee2941bb7 100644
--- a/themes/hugo-rladies/i18n/en.toml
+++ b/themes/hugo-rladies/i18n/en.toml
@@ -3,7 +3,6 @@
 [404_description]
     other = "Oops! This page doesn't exist!"
 
-
 [subheader]
     other = ""
 
@@ -19,6 +18,8 @@
   other = "Donate to"
 [news]
   other = "News"
+[blog]
+  other = "Blog"
     
 [current_chapters_table]
   other = "Click for table of currently active R-Ladies chapters"
diff --git a/themes/hugo-rladies/layouts/_default/baseof.html b/themes/hugo-rladies/layouts/_default/baseof.html
index b17c1db15..09410e493 100644
--- a/themes/hugo-rladies/layouts/_default/baseof.html
+++ b/themes/hugo-rladies/layouts/_default/baseof.html
@@ -16,6 +16,7 @@
     {{ partial "menu.html" . }}
 
     {{ block "fastsearch" .}}
+    <!-- empty to remove -->
     {{ end }}
    
     <main id="main" class="container">
diff --git a/themes/hugo-rladies/layouts/directory/list.html b/themes/hugo-rladies/layouts/directory/list.html
index 74e08416a..3ba5fbacb 100644
--- a/themes/hugo-rladies/layouts/directory/list.html
+++ b/themes/hugo-rladies/layouts/directory/list.html
@@ -1,10 +1,5 @@
 
 {{ define "main" }}
-<article class="post">
-	<header class="entry-header">
- 		<h1 class="entry-title"><a href="{{ .Permalink }}" rel="bookmark">{{ .Title }}</a></h1>
-	</header>
-	
   <div class="entry-content">
 		{{ .Content }}
 	</div>
@@ -34,8 +29,6 @@ <h1 class="entry-title"><a href="{{ .Permalink }}" rel="bookmark">{{ .Title }}</
       </div>
       
     </div>
-  </div> 
-</article>
 {{ end }}
 
 {{ define  "footer" }}
diff --git a/themes/hugo-rladies/layouts/directory/single.html b/themes/hugo-rladies/layouts/directory/single.html
index e4cab0ad5..db63eb683 100644
--- a/themes/hugo-rladies/layouts/directory/single.html
+++ b/themes/hugo-rladies/layouts/directory/single.html
@@ -4,28 +4,39 @@
 		{{ .Content }}
 	</div>
 
-  <div class="flex-container full-width" id="directory-content">
+  <div class="flex-container" id="directory-content">
     
-    <center class="m-2">
       <input type="text" id="dir-search" class="fuzzy-search rounded" placeholder="Search directory..."/>
       <button class="btn btn-primary rounded sort" data-sort="name">Sort by name</button>
       <!-- <buttonr id="shuffle" type="button" class="btn btn-primary rounded">Randomly shuffle</buttonr> -->
 
-    <div class="container" id="directory-cards">
-        <ul class="list row row-cols-sm-1 row-cols-md-2 row-cols-lg-3" id="directory-grid">
+    <div class="container expand-grid" id="directory-cards">
+        <ul class="list justify-content-center row row-xl-2 row-lg-3 row-md-4 row-sm-6 row-9 full-width" id="directory-grid">
             {{ $directory := ( .Scratch.Get "directory" ) }}
             {{ range $name := $.Scratch.Get "dic" | shuffle }}
               {{ $d := index $directory $name }}
-              {{ partial "directory/li.html" $d }}
+              {{ $dir := newScratch }}
+              {{ $dir.Set "subtitle" "" }} 
+              {{ with $d.work.title }} {{$dir.Set "subtitle" . }} {{ end }}
+
+              {{ with $d.social_media }}
+                    {{ $some := partial "some.html" (dict "data" .) }}
+                    {{ $dir.Add "subtitle" $some }} 
+              {{ end }}
+
+              {{ $descr := partial "funcs/directory/descr.html" $d }}
+              {{ $subtitle := ($dir.Get "subtitle" ) }}
+              {{ $foot := (partial "funcs/directory/foot.html" $d ) }}
+              {{ partial "funcs/card-expand.html" (dict "title" $d.name "subtitle" $subtitle "size" "large" "img" $d.photo.url "category" $d.honorific "descr" $descr "foot" $foot "footcol" 2 "id" $name ) }}
             {{ end }}
         </ul>
       </div>
       
       <!-- pagination nav -->
       <div class="nav pagination justify-content-center align-content-center" aria-label="Directory pagination">
-        <a class="pagination-prev" href="#directory-content" onclick=".prev()"><</a>
+        <a class="pagination-prev disabled" href="#directory-content"><span class="page-arrow"><</span></a>
         <ul class="pagination-layout"></ul>
-        <a class="pagination-next" href="#directory-content" onclick=".next()">></a>
+        <a class="pagination-next" href="#directory-content"><span class="page-arrow">></span></a>
       </div>
       
     </div>
@@ -48,8 +59,8 @@
         page: perPage,
         pagination: {
           innerWindow: 1,
-          left: 0,
-          right: 0,
+          left: 2,
+          right: 2,
           paginationClass: "pagination-layout",
           item: "<li><a class='page' href='#directory-content'></a></li>"
         },
@@ -78,7 +89,12 @@
         }
       });
       
-
+	$(".pagination-next").click(function() {
+		$(".pagination-layout .active").next('li')[0].firstChild.click()
+	});
+	$(".pagination-prev").click(function() {
+		$(".pagination-layout .active").prev('li')[0].firstChild.click()
+	});
 
       // find url anchor and populate search field.
       var entry = decodeURIComponent(window.location.hash.substr(1));
diff --git a/themes/hugo-rladies/layouts/events/single.html b/themes/hugo-rladies/layouts/events/single.html
index 9154c68ad..6d602e462 100644
--- a/themes/hugo-rladies/layouts/events/single.html
+++ b/themes/hugo-rladies/layouts/events/single.html
@@ -5,7 +5,7 @@
 {{ define "main" }} 
   {{ $update := .Site.Data.events_updated }}
   <div class="entry-content">{{ .Content }}</div>
-  {{ range $update }}
+  {{ range .Site.Data.events_updated  }}
   <center>
     <div class="row">
       <div class="col-12 border border-primary rounded bg-primary text-white ">
diff --git a/themes/hugo-rladies/layouts/global-team/single.html b/themes/hugo-rladies/layouts/global-team/single.html
index b728de41b..9a7687f14 100644
--- a/themes/hugo-rladies/layouts/global-team/single.html
+++ b/themes/hugo-rladies/layouts/global-team/single.html
@@ -53,12 +53,25 @@
           {{ range $name, $_ := $gt.current }}
               {{ $.Scratch.Add "gtc" $name }}
           {{ end }} 
-  
+          
+          {{ $path := $.Site.GetPage "section" "global-team" }}
+
           {{ range $name := $.Scratch.Get "gtc" | shuffle }}
             {{ $d := index $gt.current $name }}
             {{ $descr := delimit $d.role ", " }}
-            {{ $img := ( printf "about-us/global-team/img/%s" $d.img ) }}
-            {{ partial "funcs/card-expand.html" (dict "title" $d.name "img" $img "descr" $descr "size" "small") }}
+            {{ $img := ( printf "about-us/global-team/img/%s" $d.img.url ) }}
+            {{ $image := $path.Resources.GetMatch ( printf "img/%s*" $name ) }}
+            {{ $image := $image.Fit "200x200" }}
+            
+            {{ $data := newScratch }}
+            {{ $data.Set "foot" "" }}
+            {{ with $d.img.credit }}
+                {{ $data.Set "foot" "<p class=\"card-text text-muted\"><small>" }}
+                {{ $data.Add "foot" (printf "Photo credit: %s" . ) }}
+                {{ $data.Add "foot" "</small></p>" }}
+            {{ end }}
+
+            {{ partial "funcs/card-expand.html" (dict "title" $d.name "img" $image.RelPermalink "foot" $descr "size" "small" "descr" ($data.Get "foot")) }}
           {{ end }}
       </ul>
     </div>
@@ -77,7 +90,7 @@ <h1 class="section-title">Alumni</h1>
         {{ range $name := $.Scratch.Get "gta" | shuffle }}
             {{ $d := index $gt.alumni $name }}
             {{ $descr := delimit $d.role ", " }}
-            {{ $img := ( printf "about-us/global-team/img/%s" $d.img ) }}
+            {{ $img := ( printf "about-us/global-team/img/%s" $d.img.url ) }}
             {{ $foot := (printf "%s &#8212 %s" $d.start $d.end)}}
             {{ partial "funcs/card-expand.html" (dict "title" $d.name "img" $img "descr" $descr "size" "small" "foot" $foot) }}
         {{ end }}
diff --git a/themes/hugo-rladies/layouts/index.html b/themes/hugo-rladies/layouts/index.html
index 5743491b2..55559f901 100644
--- a/themes/hugo-rladies/layouts/index.html
+++ b/themes/hugo-rladies/layouts/index.html
@@ -1,9 +1,9 @@
-{{ define "fastsearch" }}
-{{ end }}
+{{ define "fastsearch" }} <!-- empty to remove --> {{ end }}
+
+{{ define "title" }} <!-- empty to remove --> {{ end }}
+
+{{ define "translation"}} <!-- empty to remove --> {{ end }}
 
-{{ define "title" }}
-<p></p>
-{{ end }}
 
 {{ define "translation"}}
 {{ end }}
@@ -34,9 +34,9 @@ <h2 class="section-title">
       {{ end }}
     </div>
     <h2 class="section-title" id="home-blog">
-      <a href="./post"><span>{{ i18n "blog" }}</span></a>
+      <a href="./blog"><span>{{ i18n "blog" }}</span></a>
     </h2>
-    {{ range first 1 (where site.RegularPages "Type" "post") }}
+    {{ range first 1 (where site.RegularPages "Type" "blog") }}
       {{ partial "post/summary.html" . }}
     {{ end }}
 {{ end }}
diff --git a/themes/hugo-rladies/layouts/partials/cards/card-expand.html b/themes/hugo-rladies/layouts/partials/cards/card-expand.html
new file mode 100644
index 000000000..8b45f6783
--- /dev/null
+++ b/themes/hugo-rladies/layouts/partials/cards/card-expand.html
@@ -0,0 +1,17 @@
+<div class="post-card">
+  <div class="post-img">
+    <div class="date">
+      <div class="day">15</div>
+      <div class="month">Aug</div>
+    </div>
+    <img src="https://images.unsplash.com/photo-1467307983825-619715426c70?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&s=fae278c7b8eeffec370bda6e42f5a827" />
+  </div>
+  <div class="post-content">
+    <div class="category">Photos</div>
+    <h1 class="title">India</h1>
+    <h2 class="sub_title">An upcoming superpower</h2>
+    <p class="description">India is a vast South Asian country with diverse terrain – from Himalayan peaks to Indian Ocean coastline – and history reaching back 5 millennia.</p>
+    <div class="post-meta"><span class="timestamp"><i class="fa fa-clock-o"></i> 6 mins ago</span><span class="comments"><i class="fa fa-comments"></i><a href="#"> 39 comments</a></span></div>
+  </div>
+</div>
+    
\ No newline at end of file
diff --git a/themes/hugo-rladies/layouts/partials/cards/hover-img.html b/themes/hugo-rladies/layouts/partials/cards/hover-img.html
new file mode 100644
index 000000000..a77b58fca
--- /dev/null
+++ b/themes/hugo-rladies/layouts/partials/cards/hover-img.html
@@ -0,0 +1,21 @@
+{{ $descr := .descr | safeHTML }}
+{{ $title := .title | markdownify }}
+{{ $image := .img | default "placeholder.png"  }}
+{{ $image := $image | absURL  }}
+{{ $size := .size }}
+
+<div class={{ if eq $size "full-width" }} "col-xl-2 col-lg-3 col-md-4 col-sm-6 col-9" {{else}} "col-lg-4 col-md-6"  {{end}}>
+  {{with .url }} <a href="{{ . }}" id="{{ . | safeJS }}"> {{ end }}
+  <div class="card card-grid-hover card-grid-hover-img text-white rounded m-2 mb-3">
+    <img class="obj-fit-cover"src="{{ $image }}" alt="{{ $title }}">
+    <div class="card-grid-hover-overlay"></div>
+    <div class="card-grid-hover-img-content">
+      <h4 class="card-grid-hover-img-title">{{ $title }}</h4>
+      {{ with .subtitle }}
+        <p class="card-grid-hover-img-subtitle font-weight-light">{{ . | safeHTML }}</p>
+      {{ end }}
+      <div class="card-grid-hover-img-description small">{{ $descr }}</div>
+    </div>
+  </div>
+    {{with .url }} </a> {{ end }}
+</div>
diff --git a/themes/hugo-rladies/layouts/partials/directory/description.html b/themes/hugo-rladies/layouts/partials/directory/description.html
new file mode 100644
index 000000000..0b908498a
--- /dev/null
+++ b/themes/hugo-rladies/layouts/partials/directory/description.html
@@ -0,0 +1,45 @@
+
+{{ with .contact_method }} 
+<p class="card-text">
+  <b>Contact through:</b>{{ delimit . ", "}}<br>
+</p>
+ {{ end }}
+{{if gt (len .location) 1 }}
+  <p class="card-text">
+    <i class="fas fa-map-marker-alt"></i> 
+    <span class="location">
+      {{ range .location }}
+        {{ .city }}, {{ with .state }} {{.}}, {{end}} {{ .country }}
+      {{ end }}
+    </span>
+  </p>
+{{ end }}
+{{ with .interests }}
+  <p class="card-text">
+    <b><i class="fas fa-tag" style = "font-size: 15px;"></i>&nbsp;</b>
+    <span class="interests">{{ delimit . ", " }}</span>
+  </p>
+{{ end }}
+{{ range .activities }}
+  {{ with .r_groups }}
+    <p class="card-text">
+      <b><i class="fas fa-users" style = "font-size: 15px;"></i>&nbsp;</b>
+      <span class="r_groups">{{ delimit . ", " }}</span>
+    </p>
+  {{ end }}
+      
+  {{ with .r_packages }}
+    <p class="card-text">
+      <b><i class="fas fa-cube" style = "font-size: 15px;"></i>&nbsp;</b>
+      <span class="r_packages">{{ delimit . ", " }}</span>
+    </p>
+  {{ end }}
+  
+  {{ with .shiny_apps }}
+    <p class="card-text">
+      <b><i class="fab fa-stripe-s" style="font-size: 15px;"></i>&nbsp;</b>
+      <span class="shiny_apps">{{ delimit . ", " }}</span>
+    </p>
+  {{ end }}
+{{ end }}
+
diff --git a/themes/hugo-rladies/layouts/partials/directory/li.html b/themes/hugo-rladies/layouts/partials/directory/li.html
index f8b116be9..d22ce7cf2 100644
--- a/themes/hugo-rladies/layouts/partials/directory/li.html
+++ b/themes/hugo-rladies/layouts/partials/directory/li.html
@@ -1,6 +1,6 @@
-  <li class="card mx-auto mt-1 b-rladies card-directory" id="{{ .name | safeJS }}">
+  <li class="card mx-auto card-directory shadow-sm p-3 mb-5 b-0" id="{{ .name | safeJS }}">
     <div class="embed-responsive embed-responsive-4by3">
-      <img class="card-img-top embed-responsive-item" src="{{ .photo_url | default "/images/placeholder_user.png"}}" alt="{{ .name }} - {{with .honorific }}{{ . }}{{ end }}{{with .pronouns }}{{ . }}{{ end }}">
+      <img class="embed-responsive-item obj-fit-cover" src="{{ .photo_url | default "/images/placeholder_user.png"}}" alt="{{ .name }} - {{with .honorific }}{{ . }}{{ end }}{{with .pronouns }}{{ . }}{{ end }}">
     </div>
     <div class="card-body">
       <span class="card-directory-title">
diff --git a/themes/hugo-rladies/layouts/partials/funcs/card-expand.html b/themes/hugo-rladies/layouts/partials/funcs/card-expand.html
index d1ab0343e..5c1510038 100644
--- a/themes/hugo-rladies/layouts/partials/funcs/card-expand.html
+++ b/themes/hugo-rladies/layouts/partials/funcs/card-expand.html
@@ -2,8 +2,10 @@
 {{ $image := $image | absURL  }}
 {{ $size := .size | default "medium" }}
 {{ $footcol := .footcol | default 1 }}
+{{ $id := .id }}
 
-<li class="card-expand rounded card-{{ $size }}">
+
+<li class="card-expand rounded card-{{ $size }} card" id="{{ $id | urlize }}">
   <div class="card-expand-img rounded-top">
     <img src="{{ $image }}"/>
   </div>
@@ -11,11 +13,9 @@
     {{ with .category }}
       <div class="card-expand-category rounded-right">{{ . }}</div>
     {{ end }}
-    {{ with .title }}
       <h4 class="card-expand-title">
-        {{ . | markdownify }}
+        <a href="#{{ .id }}" class="name">{{ .title | safeHTML }}</a>
       </h4>
-    {{ end }}
     {{ with .subtitle }}
       <h5 class="card-expand-subtitle">
         {{ . | safeHTML }}
@@ -26,7 +26,7 @@ <h5 class="card-expand-subtitle">
         {{ . | safeHTML }} 
       </div>
     {{ end }}
-    <div class="card-expand-meta" style="column-count: {{$footcol}};">
+    <div class="card-expand-foot" style="column-count: {{$footcol}};">
       {{ with .foot }}
         <span>
           {{ . | safeHTML }}
diff --git a/themes/hugo-rladies/layouts/partials/funcs/directory-descr.html b/themes/hugo-rladies/layouts/partials/funcs/directory/descr.html
similarity index 68%
rename from themes/hugo-rladies/layouts/partials/funcs/directory-descr.html
rename to themes/hugo-rladies/layouts/partials/funcs/directory/descr.html
index be0b8ec12..f455f320a 100644
--- a/themes/hugo-rladies/layouts/partials/funcs/directory-descr.html
+++ b/themes/hugo-rladies/layouts/partials/funcs/directory/descr.html
@@ -1,6 +1,24 @@
 {{ $data := newScratch }}
 {{ $data.Set "content" "" }}
 
+{{ with .work.organisation }} 
+  {{ $data.Add "content" "<p class=\"card-text\">" }}
+  {{ $data.Add "content" "<i class=\"fa-solid fa-briefcase\"></i> " }}
+  {{ $data.Add "content" . }} 
+{{ end }}
+{{ with .work.department }} 
+  {{ $data.Add "content" ", " }} 
+  {{ $data.Add "content" . }} 
+{{ end }}
+{{ with .work.organisation }} "</p>" {{ end }}
+
+{{ with .contact_method }} 
+  {{ $data.Add "content" "<p class=\"card-text\">" }}
+  {{ $data.Add "content" "<i class=\"fa-solid fa-comment\"></i> "}}
+  {{ $data.Add "content" (delimit . ", ") }}
+  {{ $data.Add "content" "</p>" }}
+{{ end }}
+              
 {{ with .interests }}
   {{ $data.Add "content" "<p class=\"card-text\">" }}
   {{ $data.Add "content" "<b><i class=\"fas fa-tag\" style = \"font-size: 15px;\"></i>&nbsp;</b>" }}
@@ -8,7 +26,7 @@
   {{ $data.Add "content" "</p>" }}
 {{ end }}
 
-{{ range .activities }}
+{{ with .activities }}
   {{ with .r_groups }}
     {{ $data.Add "content" "<p class=\"card-text\">" }}
     {{ $data.Add "content" "<b><i class=\"fas fa-users\" style = \"font-size: 15px;\"></i>&nbsp;</b>" }}
@@ -31,10 +49,10 @@
   {{ end }}
 {{ end }}
 
-{{ with .contact_method }} 
-  {{ $data.Add "content" "<p class=\"card-text\">" }}
-  {{ $data.Add "content" (printf "<b>Contact through:</b> %s" (delimit . ", ") ) }}
-  {{ $data.Add "content" "</p>" }}
+{{ with .photo.credit }}
+  {{ $data.Add "content" "<p class=\"card-text text-muted\"><small>" }}
+  {{ $data.Add "content" (printf "Photo credit: %s" . ) }}
+  {{ $data.Add "content" "</small></p>" }}
 {{ end }}
 
 {{ return ($data.Get "content") }}
diff --git a/themes/hugo-rladies/layouts/partials/funcs/directory/foot.html b/themes/hugo-rladies/layouts/partials/funcs/directory/foot.html
new file mode 100644
index 000000000..f57b5a25d
--- /dev/null
+++ b/themes/hugo-rladies/layouts/partials/funcs/directory/foot.html
@@ -0,0 +1,35 @@
+{{ $data := newScratch }}
+
+{{ $data.Set "foot" "<i class=\"fa fa-calendar\" aria-hidden=\"true\"></i> "}}
+{{ if isset . "last_updated" }}
+  {{ $data.Add "foot" "<span class=\"update\">" }} 
+  {{ $data.Add "foot" .last_updated }} 
+  {{ $data.Add "foot" "</span>" }} 
+{{ else }}
+  {{ $data.Add "foot" "unknown" }}
+{{ end }}
+
+{{ $data.Add "foot" "<br><br>" }}
+
+{{ with .location }}
+    {{ $data.Add "foot" "<i class=\"fa-solid fa-location-dot\" aria-hidden=\"true\"></i> "}}
+    {{ with .city }} 
+      {{ $data.Add "foot" "<span class=\"city\">" }} 
+      {{ $data.Add "foot" . }} 
+      {{ $data.Add "foot" "</span>" }} 
+      {{ $data.Add "foot" ", " }}
+    {{ end }}
+    {{ with .state }} 
+      {{ $data.Add "foot" "<span class=\"state\">" }} 
+      {{ $data.Add "foot" . }} 
+      {{ $data.Add "foot" "</span>" }} 
+      {{ $data.Add "foot" ", " }}
+    {{ end }}
+    {{ with .country }} 
+      {{ $data.Add "foot" "<span class=\"country\">" }} 
+      {{ $data.Add "foot" . }} 
+      {{ $data.Add "foot" "</span>" }} 
+    {{ end }}
+{{ end }}
+
+{{ return ( $data.Get "foot" ) }}
diff --git a/themes/hugo-rladies/layouts/partials/global-team/grid.html b/themes/hugo-rladies/layouts/partials/global-team/grid.html
deleted file mode 100644
index f03e99e31..000000000
--- a/themes/hugo-rladies/layouts/partials/global-team/grid.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="card mx-auto m-1">
-  <div class="embed-responsive embed-responsive-4by3">
-    <img class="card-img-top embed-responsive-item" src="img/{{ .img | default "placeholder.png" }}" alt="{{ .name }} - {{ delimit .role ", " }}">
-  </div>
-  <div class="card-body">
-    <h5 class="card-title">{{ .name }}</h5>
-    <p class="card-text">
-      {{ delimit .role ", " }} <br>
-    </p>
-  </div>
-  {{ if .end }} 
-    <div class="card-footer"> 
-      <small>{{.start}} - <br>{{.end}}</small>
-    </div>
-  {{end}}
-</div>
diff --git a/themes/hugo-rladies/layouts/partials/global-team/table.html b/themes/hugo-rladies/layouts/partials/global-team/table.html
deleted file mode 100644
index fc3e560a0..000000000
--- a/themes/hugo-rladies/layouts/partials/global-team/table.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<tr class="mt-4">
-  <td class="text-right b-rladies-r" style="font-weight: bold;" rowspan="{{ len .role }}"> 
-    {{ .name }} 
-  </td>
- 
-  {{ range .role }}
-    <td class="text-left" style="vertical-align: top !important;"> 
-      {{ . }} 
-    </td> 
- </tr>
-  {{ end }}
-   
\ No newline at end of file
diff --git a/themes/hugo-rladies/layouts/partials/hero.html b/themes/hugo-rladies/layouts/partials/hero.html
index 25e39f1aa..ad46362d7 100644
--- a/themes/hugo-rladies/layouts/partials/hero.html
+++ b/themes/hugo-rladies/layouts/partials/hero.html
@@ -1,12 +1,12 @@
-<div class="jumbotron paral m-0" style="height: {{ if .IsHome }} 100vh {{else}} 40vh{{end}}; background-image: linear-gradient(to bottom, rgba(0,0,0,0.6) 0%,rgba(0,0,0,0.6) 100%), url({{ .Site.Params.banner | relURL }})" id="hero">
+<div class="jumbotron paral m-0 {{ if .IsHome }} home {{ end }}" style="background-image: linear-gradient(to bottom, rgba(0,0,0,0.6) 0%,rgba(0,0,0,0.6) 100%), url({{ .Site.Params.banner | relURL }})" id="hero">
   <a rel="alternate" href="{{ .Lang | relURL }}" hreflang="{{ .Lang }}" lang="{{ .Lang }}">
-    <div class="logo {{ if .IsHome }} home {{end}}">
+    <div class="logo">
       <img src="{{ .Site.Params.avatar | relURL }}">
     </div>
   </a>
   {{ if .IsHome }}
-    <a href="#home-news">
-      <i class="fa fa-chevron-down chevron"></i>
+    <a href="#home-news ">
+      <i class="fa fa-chevron-down chevron animated fadeInUp"></i>
     </a>  
   {{ end }}
 </div>
\ No newline at end of file