diff --git a/content/people/aaanaqreh/aaanaqreh.jpg b/content/people/aanaqreh/aanaqreh.jpg
similarity index 100%
rename from content/people/aaanaqreh/aaanaqreh.jpg
rename to content/people/aanaqreh/aanaqreh.jpg
diff --git a/content/people/aaanaqreh/index.md b/content/people/aanaqreh/index.md
similarity index 97%
rename from content/people/aaanaqreh/index.md
rename to content/people/aanaqreh/index.md
index 6b5e460e..b224d120 100644
--- a/content/people/aaanaqreh/index.md
+++ b/content/people/aanaqreh/index.md
@@ -1,6 +1,6 @@
 ---
 # personal photo
-avatar: "aaanaqreh.jpg"
+avatar: "aanaqreh.jpg"
 
 # position index is used for sorting/positioning on the website
 position: 2
diff --git a/content/people/dsodin/index.md b/content/people/dsodin/index.md
index cc6b087d..081c95ab 100644
--- a/content/people/dsodin/index.md
+++ b/content/people/dsodin/index.md
@@ -16,10 +16,10 @@ role: "PhD student"
 
 # Organizations/Affiliations
 organizations:
-- name: Jožef Stefan Institute
-  url: https://ijs.si
 - name: Comsensus
   url: https://comsensus.eu
+- name: Jožef Stefan Institute
+  url: https://ijs.si
 
 # COBISS/SICRIS identifier
 cobiss: 50930
diff --git a/content/people/gcerar/index.md b/content/people/gcerar/index.md
index d01943a7..18115e24 100644
--- a/content/people/gcerar/index.md
+++ b/content/people/gcerar/index.md
@@ -16,10 +16,10 @@ role: "Research Associate"
 
 # Organizations/Affiliations
 organizations:
-- name: Jožef Stefan Institute
-  url: https://ijs.si
 - name: Comsensus
   url: https://comsensus.eu
+- name: Jožef Stefan Institute
+  url: https://ijs.si
 
 # COBISS/SICRIS identifier
 cobiss: 39131
diff --git a/content/people/hyetgin/index.md b/content/people/hyetgin/index.md
index edb0165f..fdcd994b 100644
--- a/content/people/hyetgin/index.md
+++ b/content/people/hyetgin/index.md
@@ -17,7 +17,7 @@ role: "Postdoc"
 # Organizations/Affiliations
 organizations:
 - name: Middlesex University London, UK
-  url: 
+  url: https://www.mdx.ac.uk/
 
 # COBISS/SICRIS identifier
 cobiss: 53669
diff --git a/content/people/mvucnik/index.md b/content/people/mvucnik/index.md
index 0a224848..8e7cf848 100644
--- a/content/people/mvucnik/index.md
+++ b/content/people/mvucnik/index.md
@@ -15,9 +15,7 @@ title: "Matevž Vučnik"
 role: "Research associate"
 
 # Organizations/Affiliations
-organizations:
-- name: Jožef Stefan Institute
-  url: https://ijs.si
+organizations: []
 
 # COBISS/SICRIS identifier
 cobiss: 33453
diff --git a/content/people/tgale/index.md b/content/people/tgale/index.md
index e6038a30..2ded5bee 100644
--- a/content/people/tgale/index.md
+++ b/content/people/tgale/index.md
@@ -12,12 +12,12 @@ prefix: ""
 title: "Timotej Gale"
 
 # Role/position
-role: ""
+role: "BSc Student"
 
 # Organizations/Affiliations
 organizations:
-- name: University of Ljubljana
-  url:
+- name: Faculty of Computer Science, University of Ljubljana
+  url: https://www.fri.uni-lj.si/en
 
 # COBISS/SICRIS identifier
 cobiss:
diff --git a/content/people/tsolc/index.md b/content/people/tsolc/index.md
index 9a6a5be4..2374bc5a 100644
--- a/content/people/tsolc/index.md
+++ b/content/people/tsolc/index.md
@@ -9,18 +9,18 @@ position: 0
 prefix: ""
 
 # Display name
-title: "Tomaz Solc"
+title: "Tomaž Šolc"
 
 # Role/position
-role: ""
+role: "PhD Student"
 
 # Organizations/Affiliations
 organizations:
 - name: Klevio, Slovenia
-  url:
+  url: https://klevio.com/
 
 # COBISS/SICRIS identifier
-cobiss:
+cobiss: 34648 
 
 # The date when joined / departed from the lab. Empty if not used
 date_start:
diff --git a/layouts/people/alumni.html b/layouts/people/alumni.html
index 4e47d029..09a4ec72 100644
--- a/layouts/people/alumni.html
+++ b/layouts/people/alumni.html
@@ -1,8 +1,23 @@
+<li>
+    <a href="{{ .Permalink }}" class="text-decoration-none">
+        {{- with .Params.prefix -}}
+            <small class="text-body-secondary">{{ . }}</small>&nbsp;
+        {{- end -}}
+        {{- .Params.title -}}
+        {{- with index .Params.organizations 0 -}}
+            <small class="text-body-secondary">, {{ .name | markdownify | title -}}</small>
+        {{- end -}}
+    </a>
+</li>
+
+
+{{/*  
+
 {{- $resource := .Resources.GetMatch .Params.avatar -}}
-{{- $img := $resource.Fill "250x250 jpeg q90" -}}
+{{- $img := $resource.Fill "150x150 jpeg q90" -}}
 
 
-<li class="p-2 align-items-stretch" style="max-width:250px;">
+<li class="p-2 align-items-stretch" style="max-width:150px;">
     <a href="{{ .Permalink }}" class="link-unstyled">
         <div class="card" style="height:100%">
             <img
@@ -19,8 +34,14 @@ <h5 class="card-title">
                     {{- end -}}
                     {{- .Params.title -}}
                 </h5>
-                <p class="card-text">{{ .Params.role | markdownify | title }}</p>
+                {{- with index .Params.organizations 0 -}}
+                    <p class="card-text">{{ .name | markdownify | title }}</p>
+                {{- else -}}
+                    <p class="card-text">No organization information available</p>
+                {{- end -}}
             </div>
         </div>
     </a>
 </li>
+
+*/}}
\ No newline at end of file
diff --git a/layouts/people/list.html b/layouts/people/list.html
index 4a0380d5..c834c0ba 100644
--- a/layouts/people/list.html
+++ b/layouts/people/list.html
@@ -16,8 +16,8 @@ <h1>Members</h1>
 
     <section>
         <h1>Alumni</h1>
-        <ul class="list-unstyled row d-flex align-items-stretch justify-content-center justify-content-sm-start">
-        {{ range sort .Pages ".Params.position" "asc" }}
+        <ul class="list-unstyled">
+        {{ range sort .Pages ".Params.title" "asc" }}
             {{ if in .Params.user_groups "alumni" }}
                 {{ .Render "alumni" }}
             {{ end }}