diff --git a/_includes/person.html b/_includes/person.html
index a07c8b8e..62ac6314 100644
--- a/_includes/person.html
+++ b/_includes/person.html
@@ -13,7 +13,7 @@ <h2>
             <h3>
                 <div class="lowlight">
                     <div>
-                        {{ page.affiliation }}
+                        {{ page.home }}
                     </div>
                 </div>
             </h3>
diff --git a/_includes/project.html b/_includes/project.html
index 081a73bc..d84cb25e 100644
--- a/_includes/project.html
+++ b/_includes/project.html
@@ -17,7 +17,7 @@ <h3>{{ group.name }}</h3>
                 <li>
                   <a href="{{ site.baseurl }}{{ person.url }}">{{ person.name }}</a>
                   {% if person_group[1].role %}
-                    ({{ person_group[1].role }})
+                    - {{ person_group[1].role }}
                   {% endif %}
                 </li>
               {% endif %}
diff --git a/_people/abdulrahman-azab.md b/_people/abdulrahman-azab.md
index 1c91375a..21ad38b0 100644
--- a/_people/abdulrahman-azab.md
+++ b/_people/abdulrahman-azab.md
@@ -2,7 +2,7 @@
 layout: master
 include: person
 name: Abdulrahman Azab
-home: USIT
+home: <a href="https://www.usit.uio.no/">USIT</a>
 country: NO
 photo: assets/img/people/abdulrahman-azab.jpg
 email: azab@ifi.uio.no
@@ -10,7 +10,6 @@ phone:
 groups:
   staff:
   tryggve:
-    role: Expert
 ---
 
 Abdulrahman Azab, a head Engineer at the Department of Informatics, University
diff --git a/_people/antti-pursula.md b/_people/antti-pursula.md
index 923e2f79..f86ed985 100644
--- a/_people/antti-pursula.md
+++ b/_people/antti-pursula.md
@@ -2,26 +2,17 @@
 layout: master
 include: person
 name: Antti Pursula
-home: CSC
+home: <a href="https://csc.fi">CSC</a>
 country: FI
 photo: assets/img/people/antti-pursula.jpg
 email: antti.pursula@csc.fi
 phone:
 groups:
   staff:
-    role: Tryggve project leader
   tryggve:
-    home: <a href="https://neic.nordforsk.org">NeIC</a>
     role: Project leader
-    display_order: 1
   tryggve-rg:
-    home: <a href="https://neic.nordforsk.org">NeIC</a>
     role: Project leader, Chair
-    display_order: 1
-  tryggve-sg:
-    home: <a href="https://neic.nordforsk.org">NeIC</a>
-    role: Project leader, Observer
-    display_order: 200
 ---
 
 Antti Pursula is located at CSC - IT Center for Science Ltd in Finland and holds
diff --git a/_people/bengt-persson.md b/_people/bengt-persson.md
index 247d1425..3ff88f7f 100644
--- a/_people/bengt-persson.md
+++ b/_people/bengt-persson.md
@@ -2,12 +2,12 @@
 layout: master
 include: person
 name: Bengt Persson
-home: NBIS
+home: <a href="https://nbis.se/">NBIS</a>
 country: SE
 photo:
 email: bpn@icm.uu.se
 phone:
 groups:
   tryggve-sg:
-    home: <a href="https://nbis.se/">ELIXIR-SE</a>
+    role: <a href="https://nbis.se/">ELIXIR-SE</a>
 ---
diff --git a/_people/inge-jonassen.md b/_people/inge-jonassen.md
index a522d0c5..0df610d1 100644
--- a/_people/inge-jonassen.md
+++ b/_people/inge-jonassen.md
@@ -2,12 +2,12 @@
 layout: master
 include: person
 name: Inge Jonassen
-home: UiB
+home: <a href="http://www.uib.no/">UiB</a>
 country: NO
 photo:
 email: inge@ii.uib.no
 phone:
 groups:
   tryggve-sg:
-    home: <a href="http://www.bioinfo.no/elixir">ELIXIR-NO</a>
+    role: <a href="http://www.bioinfo.no/elixir">ELIXIR-NO</a>
 ---
diff --git a/_people/joel-hedlund.md b/_people/joel-hedlund.md
index 789b7660..18a417da 100644
--- a/_people/joel-hedlund.md
+++ b/_people/joel-hedlund.md
@@ -2,6 +2,7 @@
 layout: master
 include: person
 name: Joel Hedlund
+role: Senior advisor
 home: NSC
 country: SE
 photo: assets/img/people/joel-hedlund.jpg
@@ -9,20 +10,14 @@ email: joel@nsc.liu.se
 phone: "M: +46 734 607126"
 groups:
   staff:
-    role: Senior advisor
   tryggve-sg:
-    role: Chair
-    home: <a href="https://neic.nordforsk.org">NeIC</a>
-    display_order: 1
+    role: <a href="https://neic.nordforsk.org">NeIC</a>, Chair
   xt:
     role: Senior advisor
   neic2017-pc:
     role: Chair
-    display_order: 1
   bdi-sg:
-    role: Chair
-    home: <a href="https://neic.nordforsk.org">NeIC</a>
-    display_order: 1
+    role: <a href="https://neic.nordforsk.org">NeIC</a>, Chair
 ---
 
 Joel Hedlund is located at the  [National Supercomputer Centre
diff --git a/_people/peter-longreen.md b/_people/peter-longreen.md
index 905e3aab..df796e36 100644
--- a/_people/peter-longreen.md
+++ b/_people/peter-longreen.md
@@ -2,12 +2,12 @@
 layout: master
 include: person
 name: Peter Løngreen
-home: CBS
+home: <a href="http://www.cbs.dtu.dk/">CBS</a>
 country: DK
 photo:
 email: peterl@cbs.dtu.dk
 phone:
 groups:
   tryggve-sg:
-    home: <a href="http://elixir-node.cbs.dtu.dk/">ELIXIR-DK</a>
+    role: <a href="http://elixir-node.cbs.dtu.dk/">ELIXIR-DK</a>
 ---
diff --git a/_people/tommi-nyronen.md b/_people/tommi-nyronen.md
index 2f2f321c..de394098 100644
--- a/_people/tommi-nyronen.md
+++ b/_people/tommi-nyronen.md
@@ -2,12 +2,12 @@
 layout: master
 include: person
 name: Tommi Nyrönen
-home: CSC
+home: <a href="https://csc.fi">CSC</a>
 country: FI
 photo:
 email: Tommi.Nyronen@csc.fi
 phone:
 groups:
   tryggve-sg:
-    home: <a href="http://www.elixir-finland.org/">ELIXIR-FI</a>
+    role: <a href="http://www.elixir-finland.org/">ELIXIR-FI</a>
 ---
diff --git a/_projects/tryggve.md b/_projects/tryggve.md
index 0e8bbb6a..b00f6f9f 100644
--- a/_projects/tryggve.md
+++ b/_projects/tryggve.md
@@ -5,6 +5,8 @@ name: Tryggve
 groups:
   - name: Team
     suffix: ''
+  - name: Reference group
+    suffix: '-rg'
   - name: Steering group
     suffix: '-sg'
 ---