diff --git a/app/assets/stylesheets/application/layout.sass b/app/assets/stylesheets/application/layout.sass
index 5e912ccbf0ec75611bcc73c6d0785175dfca77e5..6616513cdcfe62e565a4039f7e896e79d362b81b 100644
--- a/app/assets/stylesheets/application/layout.sass
+++ b/app/assets/stylesheets/application/layout.sass
@@ -1,3 +1,7 @@
+.navbar-brand
+    img
+        max-height: 40px
+
 footer
     margin-top: 100px
 
diff --git a/app/controllers/extranet/persons_controller.rb b/app/controllers/extranet/persons_controller.rb
index 21739b53db2207eb31d3aca551be1408f5106274..24b55e34c32c173a14921b7a5775fab97f03cc79 100644
--- a/app/controllers/extranet/persons_controller.rb
+++ b/app/controllers/extranet/persons_controller.rb
@@ -4,7 +4,6 @@ class Extranet::PersonsController < ApplicationController
                               through_association: :people
 
   def index
-    @people = @people.ordered.page(params[:page])
   end
 
   def show
diff --git a/app/models/education/academic_year.rb b/app/models/education/academic_year.rb
index fbacbef0f7004e8005e2e5482b1a2f22d87a622f..ff203144a1fc362b05ad0c8e41ddb71611541381 100644
--- a/app/models/education/academic_year.rb
+++ b/app/models/education/academic_year.rb
@@ -21,6 +21,10 @@ class Education::AcademicYear < ApplicationRecord
 
   has_many :cohorts, class_name: 'Education::Cohort'
 
+  has_many :people,
+           class_name: 'University::Person',
+           through: :cohorts
+
   scope :ordered, -> { order(year: :desc) }
 
   def to_s
diff --git a/app/views/extranet/academic_years/index.html.erb b/app/views/extranet/academic_years/index.html.erb
index e5c3cd21229dd1c483b83cdd5686acfc89997388..b8e0b2fef6feb3d4cbca47500d5edad04451b30a 100644
--- a/app/views/extranet/academic_years/index.html.erb
+++ b/app/views/extranet/academic_years/index.html.erb
@@ -3,8 +3,9 @@
 <table class="<%= table_classes %>">
   <thead>
     <tr>
-      <th>Year</th>
-      <th></th>
+      <th><%= Education::AcademicYear.model_name.human %></th>
+      <th><%= Education::Cohort.model_name.human(count: 2) %></th>
+      <th><%= University::Person::Alumnus.model_name.human(count: 2) %></th>
     </tr>
   </thead>
 
@@ -12,7 +13,8 @@
     <% @academic_years.each do |year| %>
       <tr>
         <td><%= link_to year, year %></td>
-        <td></td>
+        <td><%= year.cohorts.count %></td>
+        <td><%= year.people.count %></td>
       </tr>
     <% end %>
   </tbody>
diff --git a/app/views/extranet/academic_years/show.html.erb b/app/views/extranet/academic_years/show.html.erb
index 07d6cf7dd467b0ed61e20636428889ce55024359..63eacbadedf1cb55469c54f3c5233b57706ab263 100644
--- a/app/views/extranet/academic_years/show.html.erb
+++ b/app/views/extranet/academic_years/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :title, @academic_year %>
 
-<h1><%= @academic_year %></h1>
-
 <% @academic_year.cohorts.each do |cohort| %>
   <%= link_to cohort, cohort %>
 <% end %>
+
+<%= render 'extranet/persons/list', people: @academic_year.people %>
diff --git a/app/views/extranet/cohorts/show.html.erb b/app/views/extranet/cohorts/show.html.erb
index 85133b9747dbb33d017467133a0367c7987cefd3..153a03e9a1ced7b2dd2e5245d131d8ebc95988dd 100644
--- a/app/views/extranet/cohorts/show.html.erb
+++ b/app/views/extranet/cohorts/show.html.erb
@@ -1,11 +1,3 @@
 <% content_for :title, @cohort %>
 
-<h1><%= @cohort %></h1>
-<p><%= @cohort.people.count %></p>
-<div class="row">
-  <% @cohort.people.ordered.each do |person| %>
-    <div class="col-xxl-2 col-md-3">
-      <%= link_to person, person %>
-    </div>
-  <% end %>
-</div>
+<%= render 'extranet/persons/list', people: @cohort.people %>
diff --git a/app/views/extranet/organizations/show.html.erb b/app/views/extranet/organizations/show.html.erb
index 39b24130fa4451934fc800724765ad58ded63dc4..1a8858a8183c77fbb221e456277a8e24e78b282f 100644
--- a/app/views/extranet/organizations/show.html.erb
+++ b/app/views/extranet/organizations/show.html.erb
@@ -1,3 +1 @@
 <% content_for :title, @organization %>
-
-<h1><%= @organization %></h1>
diff --git a/app/views/extranet/persons/_list.html.erb b/app/views/extranet/persons/_list.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..8904fd0bfd8323a19dd30fd8d0fe07c628873cb9
--- /dev/null
+++ b/app/views/extranet/persons/_list.html.erb
@@ -0,0 +1,39 @@
+<%
+people_paged = people.ordered.page(params[:page]).per(60)
+%>
+<p><%= people.count %> <%= University::Person::Alumnus.model_name.human(count: 2).downcase %></p>
+
+<div class="row">
+  <% people_paged.each do |person| %>
+    <div class="col-xxl-2 col-md-3">
+      <article class="card mb-4">
+        <div class="card-body">
+          <%= link_to person, class: 'stretched-link' do %>
+            <span class="small"><%= person.first_name %></span><br>
+            <%= person.last_name %>
+          <% end %>
+        </div>
+      </article>
+    </div>
+  <% end %>
+</div>
+
+<table class="<%= table_classes %>">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% people_paged.each do |person| %>
+      <tr>
+        <td><%= link_to person, person %></td>
+        <td></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= paginate people_paged, theme: 'bootstrap-5' %>
diff --git a/app/views/extranet/persons/index.html.erb b/app/views/extranet/persons/index.html.erb
index aedc4001a0bebdfb7f74ed963f67d682ba5dfd9c..dfd579b639851ad9b0d7097286a59665ebded74f 100644
--- a/app/views/extranet/persons/index.html.erb
+++ b/app/views/extranet/persons/index.html.erb
@@ -1,20 +1,3 @@
 <% content_for :title, University::Person::Alumnus.model_name.human(count: 2) %>
 
-<table class="<%= table_classes %>">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @people.each do |person| %>
-      <tr>
-        <td><%= link_to person, person %></td>
-        <td></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-<%= paginate @people, theme: 'bootstrap-5' %>
+<%= render 'extranet/persons/list', people: @people %>
diff --git a/app/views/extranet/persons/show.html.erb b/app/views/extranet/persons/show.html.erb
index aa7949ff28a324ad432e1f4d90381aabfab140fa..c7de7737c89a9f5ffa7f7d5800459bed18fdfc9a 100644
--- a/app/views/extranet/persons/show.html.erb
+++ b/app/views/extranet/persons/show.html.erb
@@ -1,3 +1 @@
 <% content_for :title, @person %>
-
-<h1><%= @person %></h1>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index d650055e705a1f5384d4a5ae5026cf80125cc622..2fb3785019f44bf66db7130a8a09417d6df46a30 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -13,6 +13,7 @@
   <body class="<%= body_classes %>">
     <%= render 'nav' %>
     <main class="container">
+      <h1><%= yield :title %></h1>
       <%= render_breadcrumbs builder: Appstack::BreadcrumbsOnRailsBuilder %>
       <%= yield %>
     </main>
diff --git a/config/locales/education/en.yml b/config/locales/education/en.yml
index d7d7ba80b698fd2c9f938ee5521dfcefb05c4494..02c60018f4e2213a6ee1e869f01d30c83210f957 100644
--- a/config/locales/education/en.yml
+++ b/config/locales/education/en.yml
@@ -4,6 +4,12 @@ en:
       education: Education
   activerecord:
     models:
+      education/academic_year:
+        one: Year
+        other: Years
+      education/cohort:
+        one: Cohort
+        other: Cohorts
       education/program:
         one: Program
         other: Programs
diff --git a/config/locales/education/fr.yml b/config/locales/education/fr.yml
index 0082a690ced00219aeb364a0955b39c465d7a0de..f7ff0e862554d026ccbc5939fc33339be8b3c848 100644
--- a/config/locales/education/fr.yml
+++ b/config/locales/education/fr.yml
@@ -4,6 +4,12 @@ fr:
       education: Enseignement
   activerecord:
     models:
+      education/academic_year:
+        one: Année
+        other: Années
+      education/cohort:
+        one: Promotion
+        other: Promotions
       education/program:
         one: Formation
         other: Formations
diff --git a/config/navigation.rb b/config/navigation.rb
index b79410e8c5304c9231905b572fff81f574402881..0cf5b2b4ee59060be1c3192f4a36f014d82f02ae 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -4,9 +4,6 @@ SimpleNavigation::Configuration.run do |navigation|
   navigation.highlight_on_subpath = true
   navigation.selected_class = 'active'
   navigation.items do |primary|
-    primary.item  :home,
-                  t('extranet.home'),
-                  root_path
     primary.item  :years,
                   Education::AcademicYear.model_name.human(count: 2),
                   education_academic_years_path