diff --git a/lib/mv_web/components/layouts/navbar.ex b/lib/mv_web/components/layouts/navbar.ex
index b917ddc..f80d405 100644
--- a/lib/mv_web/components/layouts/navbar.ex
+++ b/lib/mv_web/components/layouts/navbar.ex
@@ -18,13 +18,20 @@ defmodule MvWeb.Layouts.Navbar do
       <div class="flex gap-2">
         <form method="post" action="/set_locale" class="mr-4">
           <input type="hidden" name="_csrf_token" value={Plug.CSRFProtection.get_csrf_token()} />
-          <select name="locale" onchange="this.form.submit()" class="select select-sm">
+          <label class="sr-only" for="locale-select">{gettext("Select language")}</label>
+          <select 
+            id="locale-select"
+            name="locale" 
+            onchange="this.form.submit()" 
+            class="select select-sm"
+            aria-label={gettext("Select language")}
+          >
             <option value="de" selected={Gettext.get_locale() == "de"}>Deutsch</option>
             <option value="en" selected={Gettext.get_locale() == "en"}>English</option>
           </select>
         </form>
         <!-- Daisy UI Theme Toggle for dark and light mode-->
-        <label class="flex cursor-pointer gap-2">
+        <label class="flex cursor-pointer gap-2" aria-label={gettext("Toggle dark mode")}>
           <svg
             xmlns="http://www.w3.org/2000/svg"
             width="20"
@@ -35,11 +42,17 @@ defmodule MvWeb.Layouts.Navbar do
             stroke-width="2"
             stroke-linecap="round"
             stroke-linejoin="round"
+            aria-hidden="true"
           >
             <circle cx="12" cy="12" r="5" />
             <path d="M12 1v2M12 21v2M4.2 4.2l1.4 1.4M18.4 18.4l1.4 1.4M1 12h2M21 12h2M4.2 19.8l1.4-1.4M18.4 5.6l1.4-1.4" />
           </svg>
-          <input type="checkbox" value="dark" class="toggle theme-controller" />
+          <input 
+            type="checkbox" 
+            value="dark" 
+            class="toggle theme-controller"
+            aria-label={gettext("Toggle dark mode")}
+          />
           <svg
             xmlns="http://www.w3.org/2000/svg"
             width="20"
@@ -50,6 +63,7 @@ defmodule MvWeb.Layouts.Navbar do
             stroke-width="2"
             stroke-linecap="round"
             stroke-linejoin="round"
+            aria-hidden="true"
           >
             <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path>
           </svg>
diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex
index ee4a1a3..838a960 100644
--- a/lib/mv_web/live/member_live/show.ex
+++ b/lib/mv_web/live/member_live/show.ex
@@ -11,8 +11,9 @@ defmodule MvWeb.MemberLive.Show do
         <:subtitle>{gettext("This is a member record from your database.")}</:subtitle>
 
         <:actions>
-          <.button navigate={~p"/members"}>
+          <.button navigate={~p"/members"} aria-label={gettext("Back to members list")}>
             <.icon name="hero-arrow-left" />
+            <span class="sr-only">{gettext("Back to members list")}</span>
           </.button>
           <.button variant="primary" navigate={~p"/members/#{@member}/edit?return_to=show"}>
             <.icon name="hero-pencil-square" /> {gettext("Edit Member")}
diff --git a/lib/mv_web/live/user_live/show.ex b/lib/mv_web/live/user_live/show.ex
index 056103b..3735f8f 100644
--- a/lib/mv_web/live/user_live/show.ex
+++ b/lib/mv_web/live/user_live/show.ex
@@ -10,8 +10,9 @@ defmodule MvWeb.UserLive.Show do
         <:subtitle>{gettext("This is a user record from your database.")}</:subtitle>
 
         <:actions>
-          <.button navigate={~p"/users"}>
+          <.button navigate={~p"/users"} aria-label={gettext("Back to users list")}>
             <.icon name="hero-arrow-left" />
+            <span class="sr-only">{gettext("Back to users list")}</span>
           </.button>
           <.button variant="primary" navigate={~p"/users/#{@user}/edit?return_to=show"}>
             <.icon name="hero-pencil-square" /> {gettext("Edit User")}
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 073a047..92d254a 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -29,7 +29,7 @@ msgstr "Verbindung wird wiederhergestellt"
 
 #: lib/mv_web/live/member_live/form.ex:25
 #: lib/mv_web/live/member_live/index.html.heex:62
-#: lib/mv_web/live/member_live/show.ex:36
+#: lib/mv_web/live/member_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr "Stadt"
@@ -47,37 +47,37 @@ msgstr "Löschen"
 msgid "Edit"
 msgstr "Bearbeite"
 
-#: lib/mv_web/live/member_live/show.ex:18
-#: lib/mv_web/live/member_live/show.ex:94
+#: lib/mv_web/live/member_live/show.ex:19
+#: lib/mv_web/live/member_live/show.ex:95
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr "Mitglied bearbeiten"
 
 #: lib/mv_web/live/member_live/form.ex:18
 #: lib/mv_web/live/member_live/index.html.heex:58
-#: lib/mv_web/live/member_live/show.ex:27
+#: lib/mv_web/live/member_live/show.ex:28
 #: lib/mv_web/live/user_live/form.ex:14
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:24
+#: lib/mv_web/live/user_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr "E-Mail"
 
 #: lib/mv_web/live/member_live/form.ex:16
-#: lib/mv_web/live/member_live/show.ex:25
+#: lib/mv_web/live/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr "Vorname"
 
 #: lib/mv_web/live/member_live/form.ex:22
 #: lib/mv_web/live/member_live/index.html.heex:64
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr "Beitrittsdatum"
 
 #: lib/mv_web/live/member_live/form.ex:17
-#: lib/mv_web/live/member_live/show.ex:26
+#: lib/mv_web/live/member_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr "Nachname"
@@ -109,52 +109,52 @@ msgid "close"
 msgstr "schließen"
 
 #: lib/mv_web/live/member_live/form.ex:19
-#: lib/mv_web/live/member_live/show.ex:28
+#: lib/mv_web/live/member_live/show.ex:29
 #, elixir-autogen, elixir-format
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
 #: lib/mv_web/live/member_live/form.ex:30
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Custom Properties"
 msgstr "Eigene Eigenschaften"
 
 #: lib/mv_web/live/member_live/form.ex:23
-#: lib/mv_web/live/member_live/show.ex:34
+#: lib/mv_web/live/member_live/show.ex:35
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr "Austrittsdatum"
 
 #: lib/mv_web/live/member_live/form.ex:27
 #: lib/mv_web/live/member_live/index.html.heex:60
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex:39
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr "Hausnummer"
 
 #: lib/mv_web/live/member_live/form.ex:24
-#: lib/mv_web/live/member_live/show.ex:35
+#: lib/mv_web/live/member_live/show.ex:36
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Notizen"
 
 #: lib/mv_web/live/member_live/form.ex:20
-#: lib/mv_web/live/member_live/show.ex:29
+#: lib/mv_web/live/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr "Bezahlt"
 
 #: lib/mv_web/live/member_live/form.ex:21
 #: lib/mv_web/live/member_live/index.html.heex:63
-#: lib/mv_web/live/member_live/show.ex:32
+#: lib/mv_web/live/member_live/show.ex:33
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #: lib/mv_web/live/member_live/form.ex:28
 #: lib/mv_web/live/member_live/index.html.heex:61
-#: lib/mv_web/live/member_live/show.ex:39
+#: lib/mv_web/live/member_live/show.ex:40
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr "Postleitzahl"
@@ -174,7 +174,7 @@ msgstr "Speichern..."
 
 #: lib/mv_web/live/member_live/form.ex:26
 #: lib/mv_web/live/member_live/index.html.heex:59
-#: lib/mv_web/live/member_live/show.ex:37
+#: lib/mv_web/live/member_live/show.ex:38
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr "Straße"
@@ -184,17 +184,17 @@ msgstr "Straße"
 msgid "Use this form to manage member records and their properties."
 msgstr "Dieses Formular dient zur Verwaltung von Mitgliedern und deren Eigenschaften."
 
-#: lib/mv_web/live/member_live/show.ex:24
+#: lib/mv_web/live/member_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr "ID"
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr "Nein"
 
-#: lib/mv_web/live/member_live/show.ex:93
+#: lib/mv_web/live/member_live/show.ex:94
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr "Mitglied anzeigen"
@@ -204,7 +204,7 @@ msgstr "Mitglied anzeigen"
 msgid "This is a member record from your database."
 msgstr "Dies ist ein Mitglied aus deiner Datenbank."
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr "Ja"
@@ -281,17 +281,17 @@ msgstr "Eigenschaftstyp auswählen"
 msgid "Description"
 msgstr "Beschreibung"
 
-#: lib/mv_web/live/user_live/show.ex:17
+#: lib/mv_web/live/user_live/show.ex:18
 #, elixir-autogen, elixir-format
 msgid "Edit User"
 msgstr "Benutzer bearbeiten"
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:23
+#: lib/mv_web/live/user_live/show.ex:24
 #, elixir-autogen, elixir-format
 msgid "ID"
 msgstr "ID"
@@ -301,7 +301,7 @@ msgstr "ID"
 msgid "Immutable"
 msgstr "Unveränderlich"
 
-#: lib/mv_web/components/layouts/navbar.ex:73
+#: lib/mv_web/components/layouts/navbar.ex:87
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr "Abmelden"
@@ -335,12 +335,12 @@ msgstr "Name"
 msgid "New User"
 msgstr "Neuer Benutzer"
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr "Nicht aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "Not set"
 msgstr "Nicht gesetzt"
@@ -352,12 +352,12 @@ msgid "Note"
 msgstr "Hinweis"
 
 #: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "OIDC ID"
 msgstr "OIDC ID"
 
-#: lib/mv_web/live/user_live/show.ex:26
+#: lib/mv_web/live/user_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr "Passwort-Authentifizierung"
@@ -367,7 +367,7 @@ msgstr "Passwort-Authentifizierung"
 msgid "Please select a property type first"
 msgstr "Bitte wählen Sie zuerst einen Eigenschaftstyp"
 
-#: lib/mv_web/components/layouts/navbar.ex:69
+#: lib/mv_web/components/layouts/navbar.ex:83
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr "Profil"
@@ -412,7 +412,7 @@ msgstr "Alle Mitglieder auswählen"
 msgid "Select member"
 msgstr "Mitglied auswählen"
 
-#: lib/mv_web/components/layouts/navbar.ex:72
+#: lib/mv_web/components/layouts/navbar.ex:86
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr "Einstellungen"
@@ -422,7 +422,7 @@ msgstr "Einstellungen"
 msgid "Save User"
 msgstr "Benutzer speichern"
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:54
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr "Benutzer anzeigen"
@@ -553,22 +553,46 @@ msgstr "Passwort setzen"
 msgid "User will be created without a password. Check 'Set Password' to add one."
 msgstr "Benutzer wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen."
 
-#: lib/mv_web/live/user_live/show.ex:29
+#: lib/mv_web/live/user_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr "Verknüpftes Mitglied"
 
-#: lib/mv_web/live/member_live/show.ex:40
+#: lib/mv_web/live/member_live/show.ex:41
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr "Verknüpfter Benutzer"
 
-#: lib/mv_web/live/user_live/show.ex:39
+#: lib/mv_web/live/user_live/show.ex:40
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr "Kein Mitglied verknüpft"
 
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr "Kein Benutzer verknüpft"
+
+#: lib/mv_web/live/member_live/show.ex:14
+#: lib/mv_web/live/member_live/show.ex:16
+#, elixir-autogen, elixir-format
+msgid "Back to members list"
+msgstr "Zurück zur Mitgliederliste"
+
+#: lib/mv_web/live/user_live/show.ex:13
+#: lib/mv_web/live/user_live/show.ex:15
+#, elixir-autogen, elixir-format
+msgid "Back to users list"
+msgstr "Zurück zur Benutzerliste"
+
+#: lib/mv_web/components/layouts/navbar.ex:21
+#: lib/mv_web/components/layouts/navbar.ex:27
+#, elixir-autogen, elixir-format
+msgid "Select language"
+msgstr "Sprache auswählen"
+
+#: lib/mv_web/components/layouts/navbar.ex:34
+#: lib/mv_web/components/layouts/navbar.ex:54
+#, elixir-autogen, elixir-format
+msgid "Toggle dark mode"
+msgstr "Dunklen Modus umschalten"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 42e85d8..1262c00 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -30,7 +30,7 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:25
 #: lib/mv_web/live/member_live/index.html.heex:62
-#: lib/mv_web/live/member_live/show.ex:36
+#: lib/mv_web/live/member_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
@@ -48,37 +48,37 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:18
-#: lib/mv_web/live/member_live/show.ex:94
+#: lib/mv_web/live/member_live/show.ex:19
+#: lib/mv_web/live/member_live/show.ex:95
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:18
 #: lib/mv_web/live/member_live/index.html.heex:58
-#: lib/mv_web/live/member_live/show.ex:27
+#: lib/mv_web/live/member_live/show.ex:28
 #: lib/mv_web/live/user_live/form.ex:14
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:24
+#: lib/mv_web/live/user_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:16
-#: lib/mv_web/live/member_live/show.ex:25
+#: lib/mv_web/live/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:22
 #: lib/mv_web/live/member_live/index.html.heex:64
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:17
-#: lib/mv_web/live/member_live/show.ex:26
+#: lib/mv_web/live/member_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
@@ -110,52 +110,52 @@ msgid "close"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:19
-#: lib/mv_web/live/member_live/show.ex:28
+#: lib/mv_web/live/member_live/show.ex:29
 #, elixir-autogen, elixir-format
 msgid "Birth Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:30
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Custom Properties"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:23
-#: lib/mv_web/live/member_live/show.ex:34
+#: lib/mv_web/live/member_live/show.ex:35
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:27
 #: lib/mv_web/live/member_live/index.html.heex:60
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex:39
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:24
-#: lib/mv_web/live/member_live/show.ex:35
+#: lib/mv_web/live/member_live/show.ex:36
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:20
-#: lib/mv_web/live/member_live/show.ex:29
+#: lib/mv_web/live/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:21
 #: lib/mv_web/live/member_live/index.html.heex:63
-#: lib/mv_web/live/member_live/show.ex:32
+#: lib/mv_web/live/member_live/show.ex:33
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:28
 #: lib/mv_web/live/member_live/index.html.heex:61
-#: lib/mv_web/live/member_live/show.ex:39
+#: lib/mv_web/live/member_live/show.ex:40
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
@@ -175,7 +175,7 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:26
 #: lib/mv_web/live/member_live/index.html.heex:59
-#: lib/mv_web/live/member_live/show.ex:37
+#: lib/mv_web/live/member_live/show.ex:38
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
@@ -185,17 +185,17 @@ msgstr ""
 msgid "Use this form to manage member records and their properties."
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:24
+#: lib/mv_web/live/member_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:93
+#: lib/mv_web/live/member_live/show.ex:94
 #, elixir-autogen, elixir-format
 msgid "Show Member"
 msgstr ""
@@ -205,7 +205,7 @@ msgstr ""
 msgid "This is a member record from your database."
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
@@ -282,17 +282,17 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:17
+#: lib/mv_web/live/user_live/show.ex:18
 #, elixir-autogen, elixir-format
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:23
+#: lib/mv_web/live/user_live/show.ex:24
 #, elixir-autogen, elixir-format
 msgid "ID"
 msgstr ""
@@ -302,7 +302,7 @@ msgstr ""
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:73
+#: lib/mv_web/components/layouts/navbar.ex:87
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
@@ -336,12 +336,12 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "Not set"
 msgstr ""
@@ -353,12 +353,12 @@ msgid "Note"
 msgstr ""
 
 #: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "OIDC ID"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:26
+#: lib/mv_web/live/user_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
@@ -368,7 +368,7 @@ msgstr ""
 msgid "Please select a property type first"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:69
+#: lib/mv_web/components/layouts/navbar.ex:83
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
@@ -413,7 +413,7 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:72
+#: lib/mv_web/components/layouts/navbar.ex:86
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:54
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr ""
@@ -554,22 +554,46 @@ msgstr ""
 msgid "User will be created without a password. Check 'Set Password' to add one."
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:29
+#: lib/mv_web/live/user_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:40
+#: lib/mv_web/live/member_live/show.ex:41
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:39
+#: lib/mv_web/live/user_live/show.ex:40
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr ""
+
+#: lib/mv_web/live/member_live/show.ex:14
+#: lib/mv_web/live/member_live/show.ex:16
+#, elixir-autogen, elixir-format
+msgid "Back to members list"
+msgstr ""
+
+#: lib/mv_web/live/user_live/show.ex:13
+#: lib/mv_web/live/user_live/show.ex:15
+#, elixir-autogen, elixir-format
+msgid "Back to users list"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:21
+#: lib/mv_web/components/layouts/navbar.ex:27
+#, elixir-autogen, elixir-format
+msgid "Select language"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:34
+#: lib/mv_web/components/layouts/navbar.ex:54
+#, elixir-autogen, elixir-format
+msgid "Toggle dark mode"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index e8adaaf..933d6b8 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -30,7 +30,7 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:25
 #: lib/mv_web/live/member_live/index.html.heex:62
-#: lib/mv_web/live/member_live/show.ex:36
+#: lib/mv_web/live/member_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
@@ -48,37 +48,37 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:18
-#: lib/mv_web/live/member_live/show.ex:94
+#: lib/mv_web/live/member_live/show.ex:19
+#: lib/mv_web/live/member_live/show.ex:95
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:18
 #: lib/mv_web/live/member_live/index.html.heex:58
-#: lib/mv_web/live/member_live/show.ex:27
+#: lib/mv_web/live/member_live/show.ex:28
 #: lib/mv_web/live/user_live/form.ex:14
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:24
+#: lib/mv_web/live/user_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:16
-#: lib/mv_web/live/member_live/show.ex:25
+#: lib/mv_web/live/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:22
 #: lib/mv_web/live/member_live/index.html.heex:64
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:17
-#: lib/mv_web/live/member_live/show.ex:26
+#: lib/mv_web/live/member_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
@@ -110,52 +110,52 @@ msgid "close"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:19
-#: lib/mv_web/live/member_live/show.ex:28
+#: lib/mv_web/live/member_live/show.ex:29
 #, elixir-autogen, elixir-format
 msgid "Birth Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:30
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Custom Properties"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:23
-#: lib/mv_web/live/member_live/show.ex:34
+#: lib/mv_web/live/member_live/show.ex:35
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:27
 #: lib/mv_web/live/member_live/index.html.heex:60
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex:39
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:24
-#: lib/mv_web/live/member_live/show.ex:35
+#: lib/mv_web/live/member_live/show.ex:36
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:20
-#: lib/mv_web/live/member_live/show.ex:29
+#: lib/mv_web/live/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:21
 #: lib/mv_web/live/member_live/index.html.heex:63
-#: lib/mv_web/live/member_live/show.ex:32
+#: lib/mv_web/live/member_live/show.ex:33
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:28
 #: lib/mv_web/live/member_live/index.html.heex:61
-#: lib/mv_web/live/member_live/show.ex:39
+#: lib/mv_web/live/member_live/show.ex:40
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
@@ -175,7 +175,7 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:26
 #: lib/mv_web/live/member_live/index.html.heex:59
-#: lib/mv_web/live/member_live/show.ex:37
+#: lib/mv_web/live/member_live/show.ex:38
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
@@ -185,17 +185,17 @@ msgstr ""
 msgid "Use this form to manage member records and their properties."
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:24
+#: lib/mv_web/live/member_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:93
+#: lib/mv_web/live/member_live/show.ex:94
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr ""
@@ -205,7 +205,7 @@ msgstr ""
 msgid "This is a member record from your database."
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:30
+#: lib/mv_web/live/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
@@ -282,17 +282,17 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:17
+#: lib/mv_web/live/user_live/show.ex:18
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:23
+#: lib/mv_web/live/user_live/show.ex:24
 #, elixir-autogen, elixir-format
 msgid "ID"
 msgstr ""
@@ -302,7 +302,7 @@ msgstr ""
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:73
+#: lib/mv_web/components/layouts/navbar.ex:87
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
@@ -336,12 +336,12 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:27
+#: lib/mv_web/live/user_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Not set"
 msgstr ""
@@ -353,12 +353,12 @@ msgid "Note"
 msgstr ""
 
 #: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:25
+#: lib/mv_web/live/user_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "OIDC ID"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:26
+#: lib/mv_web/live/user_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
@@ -368,7 +368,7 @@ msgstr ""
 msgid "Please select a property type first"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:69
+#: lib/mv_web/components/layouts/navbar.ex:83
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
@@ -413,7 +413,7 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:72
+#: lib/mv_web/components/layouts/navbar.ex:86
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show User"
 msgstr ""
@@ -554,22 +554,46 @@ msgstr "Set Password"
 msgid "User will be created without a password. Check 'Set Password' to add one."
 msgstr "User will be created without a password. Check 'Set Password' to add one."
 
-#: lib/mv_web/live/user_live/show.ex:29
+#: lib/mv_web/live/user_live/show.ex:30
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Linked Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:40
+#: lib/mv_web/live/member_live/show.ex:41
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:39
+#: lib/mv_web/live/user_live/show.ex:40
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr ""
+
+#: lib/mv_web/live/member_live/show.ex:14
+#: lib/mv_web/live/member_live/show.ex:16
+#, elixir-autogen, elixir-format
+msgid "Back to members list"
+msgstr ""
+
+#: lib/mv_web/live/user_live/show.ex:13
+#: lib/mv_web/live/user_live/show.ex:15
+#, elixir-autogen, elixir-format
+msgid "Back to users list"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:21
+#: lib/mv_web/components/layouts/navbar.ex:27
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Select language"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:34
+#: lib/mv_web/components/layouts/navbar.ex:54
+#, elixir-autogen, elixir-format
+msgid "Toggle dark mode"
+msgstr ""