diff --git a/data/team/donnoh.toml b/data/team/donnoh.toml
index c736720..fb84ce7 100644
--- a/data/team/donnoh.toml
+++ b/data/team/donnoh.toml
@@ -1,4 +1,4 @@
-name = "donnoh"
+nickname = "donnoh"
 
 website = "https://lucadonnoh.github.io/"
 skills = [
diff --git a/data/team/kabir.toml b/data/team/kabir.toml
new file mode 100644
index 0000000..856c7b1
--- /dev/null
+++ b/data/team/kabir.toml
@@ -0,0 +1,7 @@
+name = "Kabir"
+nickname = "amnesy"
+role = "Member"
+email = "amnesy@mintly.it"
+skills = ["Web", "Osint", "Network Analysis", "Insulting PHP"]
+active = false
+years = [2023]
diff --git a/data/team/kabir.yml b/data/team/kabir.yml
deleted file mode 100644
index 88f7459..0000000
--- a/data/team/kabir.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Kabir
-nickname: amnesy
-role: Member
-email: amnesy@mintly.it
-skills:
-  - Web
-  - Osint
-  - Network Analysis
-  - Insulting PHP
-
-active: false
-years: [2023]
diff --git a/data/team/karina.toml b/data/team/karina.toml
new file mode 100644
index 0000000..501501c
--- /dev/null
+++ b/data/team/karina.toml
@@ -0,0 +1,8 @@
+name = "Karina Chichifoi"
+nickname = "trykatchup"
+role = "Member and Co-Lead"
+email = "karina.chichifoi@studio.unibo.it"
+website = "https://trykatchup.github.io/"
+years = [2_023]
+active = true
+skills = ["OSINT", "System Administration", "Network Analysis"]
diff --git a/data/team/karina.yml b/data/team/karina.yml
deleted file mode 100644
index cf22a23..0000000
--- a/data/team/karina.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Karina Chichifoi
-nickname: trykatchup
-
-role: Member and Co-Lead
-email: karina.chichifoi@studio.unibo.it
-website: https://trykatchup.github.io/
-
-years:
-  - 2023
-
-active: true
-
-skills:
-  - OSINT
-  - System Administration
-  - Network Analysis
diff --git a/data/team/lorenzo_guerra.toml b/data/team/lorenzo_guerra.toml
new file mode 100644
index 0000000..f4e59dd
--- /dev/null
+++ b/data/team/lorenzo_guerra.toml
@@ -0,0 +1,11 @@
+name = "Lorenzo Guerra"
+nickname = "wor"
+
+role = "Member"
+email = "guerralorenzo@proton.me"
+website = "https://lorenzo9uerra.github.io"
+
+skills = ["PWN", "Crypto", "System Administration"]
+years = [2023]
+
+active = false
diff --git a/data/team/lorenzo_guerra.yml b/data/team/lorenzo_guerra.yml
deleted file mode 100644
index 27b41fb..0000000
--- a/data/team/lorenzo_guerra.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Lorenzo Guerra (wor)
-
-role: Member
-email: lorenzo.guerra5@studio.unibo.it
-website: https://lnwor.tech
-
-skills:
-  - PWN
-  - Crypto
-  - System Administration
-
-years:
-  - 2023
-
-active: false
diff --git a/data/team/pouup.toml b/data/team/pouup.toml
new file mode 100644
index 0000000..c0718e6
--- /dev/null
+++ b/data/team/pouup.toml
@@ -0,0 +1,8 @@
+name = "Patrick Papa"
+nickname = "pouup"
+photo = "unknown.png"
+role = "Member"
+email = "patrick.papa@studio.unibo.it"
+years = [2023]
+skills = ["Crypto", "PWN", "Crying without tears /s"]
+active = false
diff --git a/data/team/pouup.yml b/data/team/pouup.yml
deleted file mode 100644
index c57a199..0000000
--- a/data/team/pouup.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Patrick Papa (pouup)
-photo: unknown.png
-role: Member
-email: patrick.papa@studio.unibo.it
-
-years: [2023]
-
-skills:
-  - Crypto
-  - PWN
-  - Crying without tears /s
-
-
-active: false
diff --git a/data/team/xgampx.toml b/data/team/xgampx.toml
index e93bafd..f9c7fe6 100644
--- a/data/team/xgampx.toml
+++ b/data/team/xgampx.toml
@@ -1,10 +1,7 @@
-name = "Gianmaria Rovelli (xgampx)"
+name = "Gianmaria Rovelli"
+nickname = "xgampx"
 role = "Member"
 website = "https://giammirove.github.io"
-skills = [
-    "Web",
-    "Reverse Engineering",
-    "Low Level Programming",
-]
+skills = ["Web", "Reverse Engineering", "Low Level Programming"]
 
 years = [2023, 2022]
diff --git a/layouts/partials/member.html b/layouts/partials/member.html
index 6d1321d..cc0afe8 100644
--- a/layouts/partials/member.html
+++ b/layouts/partials/member.html
@@ -1,6 +1,14 @@
 <div>
 
-    <h3 style="font-weight: bold;">{{ .name }} {{if .nickname}} (aka <code>{{.nickname}}</code>) {{end}}</h3>
+    <h3 style="font-weight: bold;">
+        {{if and .name .nickname}}
+        <em>{{.nickname}}</em> - {{ .name }}
+        {{else if .name}}
+        {{ .name }}
+        {{else if .nickname}}
+        <em>{{.nickname}}</em>
+        {{end}}
+    </h3>
     <p>
         {{ if not .active}}
         <em>Former member</em>
@@ -9,10 +17,10 @@ <h3 style="font-weight: bold;">{{ .name }} {{if .nickname}} (aka <code>{{.nickna
         <em>{{ .role }}</em>
         {{ end }}
         {{ if .email}}
-        | <a href="mailto:{{ .email }}">📧</a>
+        | <a href="mailto:{{ .email }}" title="{{ .nickname }}'s email address">📧</a>
         {{ end }}
         {{ if .website}}
-        | <a href="{{ .website }}">🌐</a>
+        | <a href=" {{ .website }}" title="{{.nickname}}'s website">🌐</a>
         {{ end }}
     </p>
 
diff --git a/layouts/shortcodes/team.html b/layouts/shortcodes/team.html
index 7d757a6..a49529d 100644
--- a/layouts/shortcodes/team.html
+++ b/layouts/shortcodes/team.html
@@ -1,22 +1,23 @@
-<h2>Membri attivi</h2>
+<div>
+    <h2>Membri attivi</h2>
 
-<div style="display: grid; grid-template-columns: 1fr 1fr;">
-    {{ range $.Site.Data.team }}
+    <div style="display: grid; grid-template-columns: 1fr 1fr;">
+        {{ range $.Site.Data.team }}
         {{ if .active }}
-            {{ partial "member.html" . }}
+        {{ partial "member.html" . }}
         {{ end }}
-    {{ end }}
+        {{ end }}
+    </div>
 </div>
 
-<details style="margin-top: 2rem">
-    <summary style="list-style: none;">
-        <h2 style="display: inline; text-decoration: underline; cursor: pointer;">Membri inattivi</h2>
-    </summary>
+<div style="margin-top: 2rem">
+    <h2>Membri inattivi</h2>
+
     <div style="display: grid; grid-template-columns: 1fr 1fr;">
         {{ range $.Site.Data.team }}
-            {{ if not .active  }}
-                {{ partial "member.html" . }}
-            {{ end }}
+        {{ if not .active  }}
+        {{ partial "member.html" . }}
+        {{ end }}
         {{ end }}
     </div>
-</details>
+</div>