diff --git a/_data/types.yaml b/_data/types.yaml
index 5fc6602805..f8b867da57 100644
--- a/_data/types.yaml
+++ b/_data/types.yaml
@@ -2,29 +2,29 @@
# team member roles
-pi:
- icon: fa-solid fa-microscope
- description: Principal Investigator
+# pi:
+# icon: fa-solid fa-microscope
+# description: Principal Investigator
-postdoc:
- icon: fa-solid fa-glasses
- description: Postdoctoral Researcher
+# postdoc:
+# icon: fa-solid fa-glasses
+# description: Postdoctoral Researcher
-phd:
- icon: fa-solid fa-graduation-cap
- description: PhD Student
+# phd:
+# icon: fa-solid fa-graduation-cap
+# description: PhD Student
-undergrad:
- icon: fa-solid fa-user-graduate
- description: Undergraduate Student
+# undergrad:
+# icon: fa-solid fa-user-graduate
+# description: Undergraduate Student
-programmer:
- icon: fa-solid fa-code
- description: Programmer
+# programmer:
+# icon: fa-solid fa-code
+# description: Programmer
-mascot:
- icon: fa-solid fa-dog
- description: Mascot
+# mascot:
+# icon: fa-solid fa-dog
+# description: Mascot
# general
@@ -227,3 +227,27 @@ paper_home:
paper_code:
icon: fa-solid fa-code
+
+people-homepage:
+ icon: fa-solid fa-house-user
+ text: Homepage
+
+people-profile:
+ icon: fa-solid fa-link
+ text: UCR Profile
+
+people-email:
+ icon: fa-solid fa-envelope
+ text: E-mail
+
+people-gs:
+ icon: fa-brands fa-google
+ text: Google Scholar
+
+people-twitter:
+ icon: fa-brands fa-twitter
+ text: Twitter
+
+people-office:
+ icon: fa-solid fa-location-dot
+ text: Office
diff --git a/_includes/list_no_group.html b/_includes/list_original.html
similarity index 100%
rename from _includes/list_no_group.html
rename to _includes/list_original.html
diff --git a/_includes/list_pi.html b/_includes/list_pi.html
new file mode 100644
index 0000000000..c746a5168c
--- /dev/null
+++ b/_includes/list_pi.html
@@ -0,0 +1,59 @@
+{% assign emptyarray = "" | split: "," %}
+{% assign data = site.data[include.data]
+ | default: site[include.data]
+ | default: emptyarray
+ | data_filter: include.filters
+%}
+
+{% assign years = data
+ | group_by_exp: "d", "d.date | date: '%Y'"
+ | sort: "name"
+ | reverse
+%}
+
+{% for year in years %}
+ {% assign data = year.items %}
+
+ {% if years.size > 1 %}
+ {{--}}{{ year.name }}
+ {% assign data = data | sort: "date" | reverse %}
+ {% endif %}
+
+ {% for d in data %}
+ {% assign style = d.style | default: include.style %}
+
+ {%
+ include {{ include.component | append: ".html" }}
+ affiliation=d.affiliation
+ author=d.author
+ authors=d.authors
+ buttons=d.buttons
+ caption=d.caption
+ content=d.content
+ date=d.date
+ description=d.description
+ excerpt=d.excerpt
+ height=d.height
+ icon=d.icon
+ id=d.id
+ image=d.image
+ last_modified_at=d.last_modified_at
+ link=d.link
+ lookup=d.lookup
+ name=d.name
+ publisher=d.publisher
+ repo=d.repo
+ role=d.role
+ slug=d.slug
+ style=style
+ subtitle=d.subtitle
+ tags=d.tags
+ text=d.text
+ title=d.title
+ tooltip=d.tooltip
+ type=d.type
+ url=d.url
+ width=d.width
+ %}
+ {% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/_includes/list_research.html b/_includes/list_research.html
new file mode 100644
index 0000000000..c746a5168c
--- /dev/null
+++ b/_includes/list_research.html
@@ -0,0 +1,59 @@
+{% assign emptyarray = "" | split: "," %}
+{% assign data = site.data[include.data]
+ | default: site[include.data]
+ | default: emptyarray
+ | data_filter: include.filters
+%}
+
+{% assign years = data
+ | group_by_exp: "d", "d.date | date: '%Y'"
+ | sort: "name"
+ | reverse
+%}
+
+{% for year in years %}
+ {% assign data = year.items %}
+
+ {% if years.size > 1 %}
+ {{--}}{{ year.name }}
+ {% assign data = data | sort: "date" | reverse %}
+ {% endif %}
+
+ {% for d in data %}
+ {% assign style = d.style | default: include.style %}
+
+ {%
+ include {{ include.component | append: ".html" }}
+ affiliation=d.affiliation
+ author=d.author
+ authors=d.authors
+ buttons=d.buttons
+ caption=d.caption
+ content=d.content
+ date=d.date
+ description=d.description
+ excerpt=d.excerpt
+ height=d.height
+ icon=d.icon
+ id=d.id
+ image=d.image
+ last_modified_at=d.last_modified_at
+ link=d.link
+ lookup=d.lookup
+ name=d.name
+ publisher=d.publisher
+ repo=d.repo
+ role=d.role
+ slug=d.slug
+ style=style
+ subtitle=d.subtitle
+ tags=d.tags
+ text=d.text
+ title=d.title
+ tooltip=d.tooltip
+ type=d.type
+ url=d.url
+ width=d.width
+ %}
+ {% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/_includes/list_students.html b/_includes/list_students.html
new file mode 100644
index 0000000000..c746a5168c
--- /dev/null
+++ b/_includes/list_students.html
@@ -0,0 +1,59 @@
+{% assign emptyarray = "" | split: "," %}
+{% assign data = site.data[include.data]
+ | default: site[include.data]
+ | default: emptyarray
+ | data_filter: include.filters
+%}
+
+{% assign years = data
+ | group_by_exp: "d", "d.date | date: '%Y'"
+ | sort: "name"
+ | reverse
+%}
+
+{% for year in years %}
+ {% assign data = year.items %}
+
+ {% if years.size > 1 %}
+ {{--}}{{ year.name }}
+ {% assign data = data | sort: "date" | reverse %}
+ {% endif %}
+
+ {% for d in data %}
+ {% assign style = d.style | default: include.style %}
+
+ {%
+ include {{ include.component | append: ".html" }}
+ affiliation=d.affiliation
+ author=d.author
+ authors=d.authors
+ buttons=d.buttons
+ caption=d.caption
+ content=d.content
+ date=d.date
+ description=d.description
+ excerpt=d.excerpt
+ height=d.height
+ icon=d.icon
+ id=d.id
+ image=d.image
+ last_modified_at=d.last_modified_at
+ link=d.link
+ lookup=d.lookup
+ name=d.name
+ publisher=d.publisher
+ repo=d.repo
+ role=d.role
+ slug=d.slug
+ style=style
+ subtitle=d.subtitle
+ tags=d.tags
+ text=d.text
+ title=d.title
+ tooltip=d.tooltip
+ type=d.type
+ url=d.url
+ width=d.width
+ %}
+ {% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/_layouts/member.html b/_layouts/member.html
index 034b5d080d..8361708bf9 100644
--- a/_layouts/member.html
+++ b/_layouts/member.html
@@ -29,12 +29,12 @@
%}
{% capture search -%}
- research/?search={% for alias in aliases %}"{{ alias }}" {% endfor %}
+ publications/?search={% for alias in aliases %}"{{ alias }}" {% endfor %}
{%- endcapture %}
- Search for {{ page.name | default: page.title }}'s papers on the Research page
+ Search for {{ page.name | default: page.title }}'s papers on the Publications page
diff --git a/_members/jane-smith.md b/_members/jane-smith.md
deleted file mode 100644
index c60188ecd7..0000000000
--- a/_members/jane-smith.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Jane Smith
-image: images/photo.jpg
-role: pi
-affiliation: University of Colorado
-aliases:
- - J. Smith
- - J Smith
-links:
- home-page: https://janesmith.com
- orcid: 0000-0001-8713-9213
----
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-Faucibus purus in massa tempor nec feugiat nisl pretium fusce.
-Elit at imperdiet dui accumsan.
-Duis tristique sollicitudin nibh sit amet commodo nulla facilisi.
-Vitae elementum curabitur vitae nunc sed velit dignissim sodales.
-Lacinia at quis risus sed vulputate odio ut.
-Magna eget est lorem ipsum.
diff --git a/_members/jiachen-li.md b/_members/jiachen-li.md
new file mode 100644
index 0000000000..68b31a42dc
--- /dev/null
+++ b/_members/jiachen-li.md
@@ -0,0 +1,20 @@
+---
+name: Jiachen Li
+image: people_photos/jiachenli.jpg
+role: pi
+affiliation: UC Riverside
+aliases:
+ - J. Li
+ - J Li
+links:
+ people-homepage: https://jiachenli94.github.io/
+ # people-profile: https://profiles.ucr.edu/app/home/profile/jiachenl
+ people-email: jiachen.li@ucr.edu
+ people-gs: https://scholar.google.com/citations?user=1_f79vUAAAAJ&hl
+ people-twitter: https://twitter.com/JiachenLi8
+ # people-office: 344 Winston Chung Hall (WCH)
+---
+
+Dr. Jiachen Li is an assistant professor in the [Department of Electrical and Computer Engineering](https://www.ece.ucr.edu/) and the [Department of Computer Science and Engineering](https://www1.cs.ucr.edu/) (by courtesy) at the University of California, Riverside. He is the Director of the Trustworthy Autonomous Systems Laboratory (TASL) and a faculty member in the [Center for Robotics and Intelligent Systems (CRIS)](https://www.cris.ucr.edu/). Before joining UCR, he was a postdoctoral scholar at Stanford University. He received his Ph.D. from the University of California, Berkeley. Dr. Li received an RSS Robotics Pioneer Award in 2022 and was selected as an ASME DSCD Rising Star in 2023. He is an associate editor or a reviewer for over 25 premier journals and conferences. He has organized multiple workshops on robotics, machine learning, computer vision, and intelligent transportation systems at premier international conferences, including ICRA, IROS, NeurIPS, ICCV, IV, and ITSC. More details about his research and activities can be found on his website ().
+Dr. Li’s research interest lies in the broad intersection of robotics, trustworthy AI & ML, reinforcement learning, control, and optimization as well as their applications to intelligent autonomous systems (e.g., autonomous vehicles, mobile robots, drones, cyber-physical systems), especially human-robot interactions and multi-agent systems.
+**UC Riverside Profile**: [HERE](https://profiles.ucr.edu/jiachen.li) **Office**: 344 Winston Chung Hall (WCH)
diff --git a/_members/jianpeng-yao.md b/_members/jianpeng-yao.md
new file mode 100644
index 0000000000..377605100b
--- /dev/null
+++ b/_members/jianpeng-yao.md
@@ -0,0 +1,16 @@
+---
+name: Jianpeng Yao
+image: people_photos/jianpengyao.png
+role: grad
+affiliation: UC Riverside
+aliases:
+ - J. Yao
+ - J Yao
+links:
+ people-homepage: https://jyao97.github.io/
+ people-email: jyao073@ucr.edu
+ people-gs: https://scholar.google.com/citations?user=P6I5HF8AAAAJ
+ # people-office: 344 Winston Chung Hall (WCH)
+---
+
+Jianpeng Yao is currently a first-year PhD student at UC Riverside. His research interests include robotics, reinforcement learning, and safe machine decisions.
diff --git a/_members/john-doe.md b/_members/john-doe.md
deleted file mode 100644
index 0e441c6d9f..0000000000
--- a/_members/john-doe.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: John Doe
-image: images/photo.jpg
-role: phd
-group: alum
-links:
- github: john-doe
----
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
diff --git a/_members/sarah-johnson.md b/_members/sarah-johnson.md
deleted file mode 100644
index b0d97b441a..0000000000
--- a/_members/sarah-johnson.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Sarah Johnson
-image: images/photo.jpg
-description: Lead Programmer
-role: programmer
-links:
- email: sarah.johnson@gmail.com
- twitter: sarahjohnson
----
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
diff --git a/_members/xiaopan-zhang.md b/_members/xiaopan-zhang.md
new file mode 100644
index 0000000000..6000fd73d7
--- /dev/null
+++ b/_members/xiaopan-zhang.md
@@ -0,0 +1,16 @@
+---
+name: Xiaopan Zhang
+image: people_photos/xiaopanzhang.jpg
+role: grad
+affiliation: UC Riverside
+aliases:
+ - X. Zhang
+ - X Zhang
+links:
+ # people-homepage: https://jyao97.github.io/
+ # people-email: jyao073@ucr.edu
+ # people-gs: https://scholar.google.com/citations?user=P6I5HF8AAAAJ
+ # people-office: 344 Winston Chung Hall (WCH)
+---
+
+Xiaopan Zhang is currently a first-year PhD student at UC Riverside.
\ No newline at end of file
diff --git a/people/index.md b/people/index.md
index 86f890c25a..84f49fb682 100644
--- a/people/index.md
+++ b/people/index.md
@@ -7,29 +7,11 @@ nav:
# {% include icon.html icon="fa-solid fa-users" %}Team
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
-incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
-nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-
-{% include section.html %}
-
-{% include list.html data="members" component="portrait" filters="role: pi" %}
-{% include list.html data="members" component="portrait" filters="role: ^(?!pi$)" %}
-
-{% include section.html background="images/background.jpg" dark=true %}
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
-incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
-nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-
-{% include section.html %}
-
-{% capture content %}
-
-{% include figure.html image="images/photo.jpg" %}
-{% include figure.html image="images/photo.jpg" %}
-{% include figure.html image="images/photo.jpg" %}
-
-{% endcapture %}
-
-{% include grid.html style="square" content=content %}
+#### Faculty (Principal Investigator)
+{% include list_pi.html data="members" component="portrait" filters="role: pi" %}
+#### Graduate Students
+{% include list_students.html data="members" component="portrait" filters="role: grad" %}
+#### Undergraduate Students
+{% include list_students.html data="members" component="portrait" filters="role: undergrad" %}
+#### Visiting Scholar/Students
+{% include list_students.html data="members" component="portrait" filters="role: visiting" %}
\ No newline at end of file
diff --git a/people_photos/jiachenli.jpg b/people_photos/jiachenli.jpg
new file mode 100644
index 0000000000..089876efed
Binary files /dev/null and b/people_photos/jiachenli.jpg differ
diff --git a/people_photos/jianpengyao.jpg b/people_photos/jianpengyao.jpg
new file mode 100644
index 0000000000..1c20e2edc8
Binary files /dev/null and b/people_photos/jianpengyao.jpg differ
diff --git a/people_photos/xiaopanzhang.jpg b/people_photos/xiaopanzhang.jpg
new file mode 100644
index 0000000000..2b15d44a7a
Binary files /dev/null and b/people_photos/xiaopanzhang.jpg differ
diff --git a/research/index.md b/research/index.md
index d8505d9f05..3680e8a333 100644
--- a/research/index.md
+++ b/research/index.md
@@ -10,5 +10,5 @@ nav:
The ultimate goal of our research is to build **trustworthy**, **interactive**, and **human-centered** autonomous agents that can perceive, understand, and reason about the physical world; safely interact and collaborate with humans and other agents, and clearly explain their behaviors to build trust with humans so that they can benefit society in daily lives. To achieve this goal, we have been pursuing interdisciplinary research and unifying the techniques and tools from robotics, machine learning, reinforcement learning, explainable AI, control theory, optimization, and computer vision.
-
-{% include list_no_group.html component="card_research" data="research"%}
\ No newline at end of file
+
+{% include list_research.html component="card_research" data="research"%}
\ No newline at end of file