diff --git a/.replit b/.replit
index 0e72d24..d412a8a 100644
--- a/.replit
+++ b/.replit
@@ -20,7 +20,7 @@ localPort = 33035
 externalPort = 3001
 
 [[ports]]
-localPort = 34507
+localPort = 36127
 externalPort = 4200
 
 [[ports]]
diff --git a/after-reload.png b/after-reload.png
new file mode 100644
index 0000000..f9d563f
Binary files /dev/null and b/after-reload.png differ
diff --git a/client/src/pages/guards.tsx b/client/src/pages/guards.tsx
index d4dc9f0..d3ad70f 100644
--- a/client/src/pages/guards.tsx
+++ b/client/src/pages/guards.tsx
@@ -538,15 +538,20 @@ export default function Guards() {
                   <Avatar>
                     <AvatarImage src={guard.user?.profileImageUrl || undefined} />
                     <AvatarFallback>
-                      {guard.user?.firstName?.[0]}{guard.user?.lastName?.[0]}
+                      {guard.firstName?.[0]}{guard.lastName?.[0]}
                     </AvatarFallback>
                   </Avatar>
                   <div className="flex-1 min-w-0">
                     <CardTitle className="text-lg truncate">
-                      {guard.user?.firstName} {guard.user?.lastName}
+                      {guard.firstName} {guard.lastName}
                     </CardTitle>
-                    <CardDescription className="font-mono text-xs">
-                      {guard.badgeNumber}
+                    <CardDescription className="space-y-0.5">
+                      <div className="font-mono text-xs">{guard.badgeNumber}</div>
+                      {guard.email && <div className="text-xs truncate">{guard.email}</div>}
+                      {guard.phoneNumber && <div className="text-xs">{guard.phoneNumber}</div>}
+                      <Badge variant="outline" className="text-xs mt-1">
+                        {guard.location === "roccapiemonte" ? "Roccapiemonte" : guard.location === "milano" ? "Milano" : "Roma"}
+                      </Badge>
                     </CardDescription>
                   </div>
                   <Button
diff --git a/final_reopen_edit.png b/final_reopen_edit.png
new file mode 100644
index 0000000..97852f5
Binary files /dev/null and b/final_reopen_edit.png differ
diff --git a/guards-nav.png b/guards-nav.png
new file mode 100644
index 0000000..2d7f684
Binary files /dev/null and b/guards-nav.png differ
diff --git a/no-guard-link.png b/no-guard-link.png
new file mode 100644
index 0000000..d6e941b
Binary files /dev/null and b/no-guard-link.png differ
diff --git a/no-login-button.png b/no-login-button.png
new file mode 100644
index 0000000..f9d563f
Binary files /dev/null and b/no-login-button.png differ
diff --git a/step11_toggled_switches.png b/step11_toggled_switches.png
new file mode 100644
index 0000000..a52df87
Binary files /dev/null and b/step11_toggled_switches.png differ
diff --git a/step14_after_submit.png b/step14_after_submit.png
new file mode 100644
index 0000000..e8002a0
Binary files /dev/null and b/step14_after_submit.png differ
diff --git a/step15_post_submit.png b/step15_post_submit.png
new file mode 100644
index 0000000..909b834
Binary files /dev/null and b/step15_post_submit.png differ
diff --git a/step23_after_edit_submit.png b/step23_after_edit_submit.png
new file mode 100644
index 0000000..232301a
Binary files /dev/null and b/step23_after_edit_submit.png differ
diff --git a/step24_verify_after_edit.png b/step24_verify_after_edit.png
new file mode 100644
index 0000000..32a143d
Binary files /dev/null and b/step24_verify_after_edit.png differ
diff --git a/step25_after_close_dialog.png b/step25_after_close_dialog.png
new file mode 100644
index 0000000..448d4e8
Binary files /dev/null and b/step25_after_close_dialog.png differ
diff --git a/step25_fetch_api_via_page.png b/step25_fetch_api_via_page.png
new file mode 100644
index 0000000..30ea6d8
Binary files /dev/null and b/step25_fetch_api_via_page.png differ
diff --git a/step25_reopen_edit_dialog.png b/step25_reopen_edit_dialog.png
new file mode 100644
index 0000000..e65ec86
Binary files /dev/null and b/step25_reopen_edit_dialog.png differ
diff --git a/step4_page.png b/step4_page.png
new file mode 100644
index 0000000..4fec077
Binary files /dev/null and b/step4_page.png differ
diff --git a/step5_guards_nav.png b/step5_guards_nav.png
new file mode 100644
index 0000000..2d7f684
Binary files /dev/null and b/step5_guards_nav.png differ
diff --git a/step8_add_guard_clicked.png b/step8_add_guard_clicked.png
new file mode 100644
index 0000000..ab8e969
Binary files /dev/null and b/step8_add_guard_clicked.png differ