From a5aeef3e2700e669c07b1709afeda1b3202f2760 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Thu, 27 Nov 2025 21:30:06 +0100
Subject: [PATCH 01/12] docs: payment concept

---
 docs/contributions-architecture.md | 651 +++++++++++++++++++++++++++++
 docs/contributions-overview.md     | 527 +++++++++++++++++++++++
 2 files changed, 1178 insertions(+)
 create mode 100644 docs/contributions-architecture.md
 create mode 100644 docs/contributions-overview.md

diff --git a/docs/contributions-architecture.md b/docs/contributions-architecture.md
new file mode 100644
index 0000000..b01ad30
--- /dev/null
+++ b/docs/contributions-architecture.md
@@ -0,0 +1,651 @@
+# Membership Contributions - Technical Architecture
+
+**Project:** Mila - Membership Management System  
+**Feature:** Membership Contribution Management  
+**Version:** 1.0  
+**Last Updated:** 2025-11-27  
+**Status:** Architecture Design - Ready for Implementation
+
+---
+
+## Purpose
+
+This document defines the technical architecture for the Membership Contributions system. It focuses on architectural decisions, patterns, module structure, and integration points **without** concrete implementation details.
+
+**Related Documents:**
+- [contributions-overview.md](./contributions-overview.md) - Business logic and requirements
+- [database-schema-readme.md](./database-schema-readme.md) - Database documentation
+- [database_schema.dbml](./database_schema.dbml) - Database schema definition
+
+---
+
+## Table of Contents
+
+1. [Architecture Principles](#architecture-principles)
+2. [Domain Structure](#domain-structure)
+3. [Data Architecture](#data-architecture)
+4. [Business Logic Architecture](#business-logic-architecture)
+5. [Integration Points](#integration-points)
+6. [Acceptance Criteria](#acceptance-criteria)
+7. [Testing Strategy](#testing-strategy)
+8. [Security Considerations](#security-considerations)
+9. [Performance Considerations](#performance-considerations)
+
+---
+
+## Architecture Principles
+
+### Core Design Decisions
+
+1. **Single Responsibility:**
+   - Each module has one clear responsibility
+   - Period generation separated from status management
+   - Calendar logic isolated in dedicated module
+
+2. **No Redundancy:**
+   - No `period_end` field (calculated from `period_start` + `interval`)
+   - No `interval_type` field (read from `contribution_type.interval`)
+   - Eliminates data inconsistencies
+
+3. **Immutability Where Important:**
+   - `contribution_type.interval` cannot be changed after creation
+   - Prevents complex migration scenarios
+   - Enforced via Ash change validation
+
+4. **Historical Accuracy:**
+   - `amount` stored per period for audit trail
+   - Enables tracking of contribution changes over time
+   - Old periods retain original amounts
+
+5. **Calendar-Based Periods:**
+   - All periods aligned to calendar boundaries
+   - Simplifies date calculations
+   - Predictable period generation
+
+---
+
+## Domain Structure
+
+### Ash Domain: `Mv.Contributions`
+
+**Purpose:** Encapsulates all contribution-related resources and logic
+
+**Resources:**
+- `ContributionType` - Contribution type definitions (admin-managed)
+- `ContributionPeriod` - Individual contribution periods per member
+
+**Extensions:**
+- Member resource extended with contribution fields
+
+### Module Organization
+
+```
+lib/
+├── contributions/
+│   ├── contributions.ex              # Ash domain definition
+│   ├── contribution_type.ex          # ContributionType resource
+│   ├── contribution_period.ex        # ContributionPeriod resource
+│   └── changes/
+│       ├── prevent_interval_change.ex       # Validates interval immutability
+│       ├── set_contribution_start_date.ex   # Auto-sets start date
+│       └── validate_same_interval.ex        # Validates interval match on type change
+├── mv/
+│   └── contributions/
+│       ├── period_generator.ex              # Period generation algorithm
+│       └── calendar_periods.ex              # Calendar period calculations
+└── membership/
+    └── member.ex                     # Extended with contribution relationships
+```
+
+### Separation of Concerns
+
+**Domain Layer (Ash Resources):**
+- Data validation
+- Relationship management
+- Policy enforcement
+- Action definitions
+
+**Business Logic Layer (`Mv.Contributions`):**
+- Period generation algorithm
+- Calendar calculations
+- Date boundary handling
+- Status transitions
+
+**UI Layer (LiveView):**
+- User interaction
+- Display logic
+- Authorization checks
+- Form handling
+
+---
+
+## Data Architecture
+
+### Database Schema Extensions
+
+**See:** [database-schema-readme.md](./database-schema-readme.md) and [database_schema.dbml](./database_schema.dbml) for complete schema documentation.
+
+### New Tables
+
+1. **`contribution_types`**
+   - Purpose: Define contribution types with fixed intervals
+   - Key Constraint: `interval` field immutable after creation
+   - Relationships: has_many members, has_many contribution_periods
+
+2. **`contribution_periods`**
+   - Purpose: Individual contribution periods for members
+   - Key Design: NO `period_end` or `interval_type` fields (calculated)
+   - Relationships: belongs_to member, belongs_to contribution_type
+   - Composite uniqueness: One period per member per period_start
+
+### Member Table Extensions
+
+**Fields Added:**
+- `contribution_type_id` (FK, NOT NULL with default from settings)
+- `contribution_start_date` (Date, nullable)
+
+**Existing Fields Used:**
+- `joined_at` - For calculating contribution start
+- `left_at` - For limiting period generation
+
+### Settings Integration
+
+**Global Settings:**
+- `contributions.include_joining_period` (Boolean)
+- `contributions.default_contribution_type_id` (UUID)
+
+**Storage:** Existing settings mechanism (TBD: dedicated table or configuration resource)
+
+### Foreign Key Behaviors
+
+| Relationship | On Delete | Rationale |
+|--------------|-----------|-----------|
+| `contribution_periods.member_id → members.id` | CASCADE | Remove periods when member deleted |
+| `contribution_periods.contribution_type_id → contribution_types.id` | RESTRICT | Prevent type deletion if periods exist |
+| `members.contribution_type_id → contribution_types.id` | RESTRICT | Prevent type deletion if assigned to members |
+
+---
+
+## Business Logic Architecture
+
+### Period Generation System
+
+**Component:** `Mv.Contributions.PeriodGenerator`
+
+**Responsibilities:**
+- Calculate which periods should exist for a member
+- Generate missing periods
+- Respect contribution_start_date and left_at boundaries
+- Skip existing periods (idempotent)
+
+**Triggers:**
+1. Member contribution type assigned (via Ash change)
+2. Member created with contribution type (via Ash change)
+3. Scheduled job runs (daily/weekly cron)
+4. Admin manual regeneration (UI action)
+
+**Algorithm Steps:**
+1. Retrieve member with contribution_type and dates
+2. Determine first period start (based on contribution_start_date)
+3. Calculate all period starts from first to today (or left_at)
+4. Query existing periods for member
+5. Generate missing periods with current contribution_type.amount
+6. Insert new periods (batch operation)
+
+**Edge Case Handling:**
+- If contribution_start_date is NULL: Calculate from joined_at + global setting
+- If left_at is set: Stop generation at left_at
+- If contribution_type changes: Handled separately by regeneration logic
+
+### Calendar Period Calculations
+
+**Component:** `Mv.Contributions.CalendarPeriods`
+
+**Responsibilities:**
+- Calculate period boundaries based on interval type
+- Determine current period
+- Determine last completed period
+- Calculate period_end from period_start + interval
+
+**Functions (high-level):**
+- `calculate_period_start/3` - Given date and interval, find period start
+- `calculate_period_end/2` - Given period_start and interval, calculate end
+- `next_period_start/2` - Given period_start and interval, find next
+- `is_current_period?/2` - Check if period contains today
+- `is_last_completed_period?/2` - Check if period just ended
+
+**Interval Logic:**
+- **Monthly:** Start = 1st of month, End = last day of month
+- **Quarterly:** Start = 1st of quarter (Jan/Apr/Jul/Oct), End = last day of quarter
+- **Half-yearly:** Start = 1st of half (Jan/Jul), End = last day of half
+- **Yearly:** Start = Jan 1st, End = Dec 31st
+
+### Status Management
+
+**Component:** Ash actions on `ContributionPeriod`
+
+**Status Transitions:**
+- Simple state machine: unpaid ↔ paid ↔ suspended
+- No complex validation (all transitions allowed)
+- Permissions checked via Ash policies
+
+**Actions Required:**
+- `mark_as_paid` - Set status to :paid
+- `mark_as_suspended` - Set status to :suspended  
+- `mark_as_unpaid` - Set status to :unpaid (error correction)
+
+**Bulk Operations:**
+- `bulk_mark_as_paid` - Mark multiple periods as paid (efficiency)
+
+### Contribution Type Change Handling
+
+**Component:** Ash change on `Member.contribution_type_id`
+
+**Validation:**
+- Check if new type has same interval as old type
+- If different: Reject change (MVP constraint)
+- If same: Allow change
+
+**Side Effects on Allowed Change:**
+1. Keep all existing periods unchanged
+2. Find future unpaid periods
+3. Delete future unpaid periods
+4. Regenerate periods with new contribution_type_id and amount
+
+**Implementation Pattern:**
+- Use Ash change module to validate
+- Use after_action hook to trigger regeneration
+- Use transaction to ensure atomicity
+
+---
+
+## Integration Points
+
+### Member Resource Integration
+
+**Extension Points:**
+1. Add fields via migration
+2. Add relationships (belongs_to, has_many)
+3. Add calculations (current_period_status, overdue_count)
+4. Add changes (auto-set contribution_start_date, validate interval)
+
+**Backward Compatibility:**
+- New fields nullable or with defaults
+- Existing members get default contribution type from settings
+- No breaking changes to existing member functionality
+
+### Settings System Integration
+
+**Requirements:**
+- Store two global settings
+- Provide UI for admin to modify
+- Default values if not set
+- Validation (e.g., default_contribution_type_id must exist)
+
+**Access Pattern:**
+- Read settings during period generation
+- Read settings during member creation
+- Write settings only via admin UI
+
+### Permission System Integration
+
+**See:** [roles-and-permissions-architecture.md](./roles-and-permissions-architecture.md)
+
+**Required Permissions:**
+- `ContributionType.create/update/destroy` - Admin only
+- `ContributionType.read` - Admin, Treasurer, Board
+- `ContributionPeriod.update` (status changes) - Admin, Treasurer
+- `ContributionPeriod.read` - Admin, Treasurer, Board, Own member
+
+**Policy Patterns:**
+- Use existing HasPermission check
+- Leverage existing roles (Admin, Kassenwart)
+- Member can read own periods (linked via member_id)
+
+### LiveView Integration
+
+**New LiveViews Required:**
+1. ContributionType index/form (admin)
+2. ContributionPeriod table component (member detail view)
+3. Settings form section (admin)
+4. Member list column (contribution status)
+
+**Existing LiveViews to Extend:**
+- Member detail view: Add contributions section
+- Member list view: Add status column
+- Settings page: Add contributions section
+
+**Authorization Helpers:**
+- Use existing `can?/3` helper for UI conditionals
+- Check permissions before showing actions
+
+---
+
+## Acceptance Criteria
+
+### ContributionType Resource
+
+**AC-CT-1:** Admin can create contribution type with name, amount, interval, description  
+**AC-CT-2:** Interval field is immutable after creation (validation error on change attempt)  
+**AC-CT-3:** Admin can update name, amount, description (but not interval)  
+**AC-CT-4:** Cannot delete contribution type if assigned to members  
+**AC-CT-5:** Cannot delete contribution type if periods exist referencing it  
+**AC-CT-6:** Interval must be one of: monthly, quarterly, half_yearly, yearly
+
+### ContributionPeriod Resource
+
+**AC-CP-1:** Period has period_start, status, amount, notes, member_id, contribution_type_id  
+**AC-CP-2:** Period_end is calculated, not stored  
+**AC-CP-3:** Status defaults to :unpaid  
+**AC-CP-4:** One period per member per period_start (uniqueness constraint)  
+**AC-CP-5:** Amount is set at generation time from contribution_type.amount  
+**AC-CP-6:** Periods cascade delete when member deleted  
+**AC-CP-7:** Admin/Treasurer can change status  
+**AC-CP-8:** Member can read own periods
+
+### Member Extensions
+
+**AC-M-1:** Member has contribution_type_id field (NOT NULL with default)  
+**AC-M-2:** Member has contribution_start_date field (nullable)  
+**AC-M-3:** New members get default contribution type from global setting  
+**AC-M-4:** contribution_start_date auto-set based on joined_at and global setting  
+**AC-M-5:** Admin can manually override contribution_start_date  
+**AC-M-6:** Cannot change to contribution type with different interval (MVP)
+
+### Period Generation
+
+**AC-PG-1:** Periods generated when member gets contribution type  
+**AC-PG-2:** Periods generated when member created (via change hook)  
+**AC-PG-3:** Scheduled job generates missing periods daily  
+**AC-PG-4:** Generation respects contribution_start_date  
+**AC-PG-5:** Generation stops at left_at if member exited  
+**AC-PG-6:** Generation is idempotent (skips existing periods)  
+**AC-PG-7:** Periods align to calendar boundaries (1st of month/quarter/half/year)  
+**AC-PG-8:** Amount comes from contribution_type at generation time
+
+### Calendar Logic
+
+**AC-CL-1:** Monthly periods: 1st to last day of month  
+**AC-CL-2:** Quarterly periods: 1st of Jan/Apr/Jul/Oct to last day of quarter  
+**AC-CL-3:** Half-yearly periods: 1st of Jan/Jul to last day of half  
+**AC-CL-4:** Yearly periods: Jan 1 to Dec 31  
+**AC-CL-5:** Period_end calculated correctly for all interval types  
+**AC-CL-6:** Current period determined correctly based on today's date  
+**AC-CL-7:** Last completed period determined correctly
+
+### Contribution Type Change
+
+**AC-TC-1:** Can change to type with same interval  
+**AC-TC-2:** Cannot change to type with different interval (error message)  
+**AC-TC-3:** On allowed change: future unpaid periods regenerated  
+**AC-TC-4:** On allowed change: paid/suspended periods unchanged  
+**AC-TC-5:** On allowed change: amount updated to new type's amount  
+**AC-TC-6:** Change is atomic (transaction)
+
+### Settings
+
+**AC-S-1:** Global setting: include_joining_period (boolean, default true)  
+**AC-S-2:** Global setting: default_contribution_type_id (UUID, required)  
+**AC-S-3:** Admin can modify settings via UI  
+**AC-S-4:** Settings validated (e.g., default type must exist)  
+**AC-S-5:** Settings applied to new members immediately
+
+### UI - Member List
+
+**AC-UI-ML-1:** New column shows contribution status  
+**AC-UI-ML-2:** Default: Shows last completed period status  
+**AC-UI-ML-3:** Optional: Toggle to show current period status  
+**AC-UI-ML-4:** Color coding: green (paid), red (unpaid), gray (suspended)  
+**AC-UI-ML-5:** Filter: Unpaid in last period  
+**AC-UI-ML-6:** Filter: Unpaid in current period
+
+### UI - Member Detail
+
+**AC-UI-MD-1:** Contributions section shows all periods  
+**AC-UI-MD-2:** Table columns: Period, Interval, Amount, Status, Actions  
+**AC-UI-MD-3:** Checkbox per period for bulk marking  
+**AC-UI-MD-4:** "Mark selected as paid" button  
+**AC-UI-MD-5:** Dropdown to change contribution type (same interval only)  
+**AC-UI-MD-6:** Warning if different interval selected  
+**AC-UI-MD-7:** Only show actions if user has permission
+
+### UI - Contribution Types Admin
+
+**AC-UI-CTA-1:** List all contribution types  
+**AC-UI-CTA-2:** Show: Name, Amount, Interval, Member count  
+**AC-UI-CTA-3:** Create new contribution type form  
+**AC-UI-CTA-4:** Edit form: Name, Amount, Description editable  
+**AC-UI-CTA-5:** Edit form: Interval grayed out (not editable)  
+**AC-UI-CTA-6:** Warning on amount change (explain impact)  
+**AC-UI-CTA-7:** Cannot delete if members assigned  
+**AC-UI-CTA-8:** Only admin can access
+
+### UI - Settings Admin
+
+**AC-UI-SA-1:** Contributions section in settings  
+**AC-UI-SA-2:** Dropdown to select default contribution type  
+**AC-UI-SA-3:** Checkbox: Include joining period  
+**AC-UI-SA-4:** Explanatory text with examples  
+**AC-UI-SA-5:** Save button with validation
+
+---
+
+## Testing Strategy
+
+### Unit Testing
+
+**Period Generator Tests:**
+- Correct period_start calculation for all interval types
+- Correct period count from start to end date
+- Respects contribution_start_date boundary
+- Respects left_at boundary
+- Skips existing periods (idempotent)
+- Handles edge dates (year boundaries, leap years)
+
+**Calendar Periods Tests:**
+- Period boundaries correct for all intervals
+- Period_end calculation correct
+- Current period detection
+- Last completed period detection
+- Next period calculation
+
+**Validation Tests:**
+- Interval immutability enforced
+- Same interval validation on type change
+- Status transitions allowed
+- Uniqueness constraints enforced
+
+### Integration Testing
+
+**Period Generation Flow:**
+- Member creation triggers generation
+- Type assignment triggers generation
+- Type change regenerates future periods
+- Scheduled job generates missing periods
+- Left member stops generation
+
+**Status Management Flow:**
+- Mark single period as paid
+- Bulk mark multiple periods
+- Status transitions work
+- Permissions enforced
+
+**Contribution Type Management:**
+- Create type
+- Update amount (regeneration triggered)
+- Cannot update interval
+- Cannot delete if in use
+
+### LiveView Testing
+
+**Member List:**
+- Status column displays correctly
+- Toggle between last/current works
+- Filters work correctly
+- Color coding applied
+
+**Member Detail:**
+- Periods table displays all periods
+- Checkboxes work
+- Bulk marking works
+- Type change validation works
+- Actions only shown with permission
+
+**Admin UI:**
+- Type CRUD works
+- Settings save correctly
+- Validations display errors
+- Only authorized users can access
+
+### Edge Case Testing
+
+**Interval Change Attempt:**
+- Error message displayed
+- No data modified
+- User can cancel/choose different type
+
+**Exit with Unpaid:**
+- Warning shown
+- Option to suspend offered
+- Exit completes correctly
+
+**Amount Change:**
+- Warning displayed
+- Only future unpaid regenerated
+- Historical periods unchanged
+
+**Date Boundaries:**
+- Today = period start handled
+- Today = period end handled
+- Leap year handled
+
+### Performance Testing
+
+**Period Generation:**
+- Generate 10 years of monthly periods: < 100ms
+- Generate for 1000 members: < 5 seconds
+- Idempotent check efficient (no full scan)
+
+**Member List Query:**
+- With status column: < 200ms for 1000 members
+- Filters applied efficiently
+- No N+1 queries
+
+---
+
+## Security Considerations
+
+### Authorization
+
+**Permissions Required:**
+- ContributionType management: Admin only
+- ContributionPeriod status changes: Admin + Treasurer
+- View all periods: Admin + Treasurer + Board
+- View own periods: All authenticated users
+
+**Policy Enforcement:**
+- All actions protected by Ash policies
+- UI shows/hides based on permissions
+- Backend validates permissions (never trust UI alone)
+
+### Data Integrity
+
+**Validation Layers:**
+1. Database constraints (NOT NULL, UNIQUE, CHECK)
+2. Ash validations (business rules)
+3. UI validations (user experience)
+
+**Immutability Protection:**
+- Interval change prevented at multiple layers
+- Period amounts immutable (audit trail)
+- Settings changes logged (future)
+
+### Audit Trail
+
+**Tracked Information:**
+- Period status changes (who, when) - future enhancement
+- Type amount changes (implicit via period amounts)
+- Member type assignments (via timestamps)
+
+---
+
+## Performance Considerations
+
+### Database Indexes
+
+**Required Indexes:**
+- `contribution_periods(member_id)` - For member period lookups
+- `contribution_periods(contribution_type_id)` - For type queries
+- `contribution_periods(status)` - For unpaid filters
+- `contribution_periods(period_start)` - For date range queries
+- `contribution_periods(member_id, period_start)` - Composite unique index
+- `members(contribution_type_id)` - For type membership count
+
+### Query Optimization
+
+**Preloading:**
+- Load contribution_type with periods (avoid N+1)
+- Load periods when displaying member detail
+- Use Ash's load for efficient preloading
+
+**Calculated Fields:**
+- period_end calculated on-demand (not stored)
+- current_period_status calculated when needed
+- Use Ash calculations for lazy evaluation
+
+**Pagination:**
+- Period list paginated if > 50 periods
+- Member list already paginated
+
+### Caching Strategy
+
+**No caching needed in MVP:**
+- Contribution types rarely change
+- Period queries are fast
+- Settings read infrequently
+
+**Future caching if needed:**
+- Cache settings in application memory
+- Cache contribution types list
+- Invalidate on change
+
+### Scheduled Job Performance
+
+**Period Generation Job:**
+- Run daily or weekly (not hourly)
+- Batch members (process 100 at a time)
+- Skip members with no changes
+- Log failures for retry
+
+---
+
+## Future Enhancements
+
+### Phase 2: Interval Change Support
+
+**Architecture Changes:**
+- Add logic to handle period overlaps
+- Calculate prorata amounts if needed
+- More complex validation
+- Migration path for existing periods
+
+### Phase 3: Payment Details
+
+**Architecture Changes:**
+- Add PaymentTransaction resource
+- Link transactions to periods
+- Support multiple payments per period
+- Reconciliation logic
+
+### Phase 4: vereinfacht.digital Integration
+
+**Architecture Changes:**
+- External API client module
+- Webhook handling for transactions
+- Automatic matching logic
+- Manual review interface
+
+---
+
+**End of Architecture Document**
+
diff --git a/docs/contributions-overview.md b/docs/contributions-overview.md
new file mode 100644
index 0000000..03f347b
--- /dev/null
+++ b/docs/contributions-overview.md
@@ -0,0 +1,527 @@
+# Membership Contributions - Overview
+
+**Project:** Mila - Membership Management System  
+**Feature:** Membership Contribution Management  
+**Version:** 1.0  
+**Last Updated:** 2025-11-27  
+**Status:** Concept - Ready for Review
+
+---
+
+## Purpose
+
+This document provides a comprehensive overview of the Membership Contributions system. It covers business logic, data model, UI/UX design, and technical architecture in a concise, bullet-point format.
+
+**For detailed implementation:** See [contributions-implementation-plan.md](./contributions-implementation-plan.md) (created after concept iterations)
+
+---
+
+## Table of Contents
+
+1. [Core Principle](#core-principle)
+2. [Terminology](#terminology)
+3. [Data Model](#data-model)
+4. [Business Logic](#business-logic)
+5. [UI/UX Design](#uiux-design)
+6. [Edge Cases](#edge-cases)
+7. [Technical Integration](#technical-integration)
+8. [Implementation Scope](#implementation-scope)
+
+---
+
+## Core Principle
+
+**Maximum Simplicity:**
+
+- Minimal complexity
+- Clear data model without redundancies
+- Intuitive operation
+- Calendar period-based (Month/Quarter/Half-Year/Year)
+
+---
+
+## Terminology
+
+### German ↔ English
+
+**Core Entities:**
+
+- Beitragsart ↔ Contribution Type / Membership Fee Type
+- Beitragsintervall ↔ Contribution Period
+- Mitgliedsbeitrag ↔ Membership Fee / Contribution
+
+**Status:**
+
+- bezahlt ↔ paid
+- unbezahlt ↔ unpaid
+- ausgesetzt ↔ suspended / waived
+
+**Intervals:**
+
+- monatlich ↔ monthly
+- quartalsweise ↔ quarterly
+- halbjährlich ↔ half-yearly / semi-annually
+- jährlich ↔ yearly / annually
+
+**UI Elements:**
+
+- "Letztes Intervall" ↔ "Last Period" (e.g., 2023 when in 2024)
+- "Aktuelles Intervall" ↔ "Current Period" (e.g., 2024)
+- "Als bezahlt markieren" ↔ "Mark as paid"
+- "Aussetzen" ↔ "Suspend" / "Waive"
+
+---
+
+## Data Model
+
+### Contribution Type (ContributionType)
+
+```
+- id (UUID)
+- name (String) - e.g., "Regular", "Reduced", "Student"
+- amount (Decimal) - Contribution amount in Euro
+- interval (Enum) - :monthly, :quarterly, :half_yearly, :yearly
+- description (Text, optional)
+- timestamps
+```
+
+**Important:**
+
+- `interval` is **IMMUTABLE** after creation!
+- Admin can only change `name`, `amount`, `description`
+- On change: Future unpaid periods regenerated with new amount
+
+### Contribution Period (ContributionPeriod)
+
+```
+- id (UUID)
+- member_id (FK → members.id)
+- contribution_type_id (FK → contribution_types.id)
+- period_start (Date) - Calendar period start (01.01., 01.04., 01.07., 01.10., etc.)
+- status (Enum) - :unpaid (default), :paid, :suspended
+- amount (Decimal) - Amount at generation time (history when type changes)
+- notes (Text, optional) - Admin notes
+- timestamps
+```
+
+**Important:**
+
+- **NO** `period_end` - calculated from `period_start` + `interval`
+- **NO** `interval_type` - read from `contribution_type.interval`
+- Avoids redundancy and inconsistencies!
+
+**Calendar Period Logic:**
+
+- Monthly: 01.01. - 31.01., 01.02. - 28./29.02., etc.
+- Quarterly: 01.01. - 31.03., 01.04. - 30.06., 01.07. - 30.09., 01.10. - 31.12.
+- Half-yearly: 01.01. - 30.06., 01.07. - 31.12.
+- Yearly: 01.01. - 31.12.
+
+### Member (Extensions)
+
+```
+- contribution_type_id (FK → contribution_types.id, NOT NULL, default from settings)
+- contribution_start_date (Date, nullable) - When to start generating contributions
+- left_at (Date, nullable) - Exit date (existing)
+```
+
+**Logic for contribution_start_date:**
+
+- Auto-set based on global setting `include_joining_period`
+- If `include_joining_period = true`: First day of joining month/quarter/year
+- If `include_joining_period = false`: First day of NEXT period after joining
+- Can be manually overridden by admin
+
+**NO** `include_joining_period` field on Member - unnecessary due to `contribution_start_date`!
+
+### Global Settings
+
+```
+key: "contributions.include_joining_period" 
+value: Boolean (Default: true)
+
+key: "contributions.default_contribution_type_id"
+value: UUID (Required) - Default contribution type for new members
+```
+
+**Meaning include_joining_period:**
+
+- `true`: Joining period is included (member pays from joining period)
+- `false`: Only from next full period after joining
+
+**Meaning default_contribution_type_id:**
+
+- Every new member automatically gets this contribution type
+- Must be configured in admin settings
+- Prevents: Members without contribution type
+
+---
+
+## Business Logic
+
+### Period Generation
+
+**Triggers:**
+
+- Member gets contribution type assigned (also during member creation)
+- New period begins (Cron job daily/weekly)
+- Admin requests manual regeneration
+
+**Algorithm:**
+
+1. Get `member.contribution_start_date` and `member.contribution_type`
+2. Calculate first period based on `contribution_start_date`
+3. Generate all periods from start to today (or `left_at` if present)
+4. Skip existing periods
+5. Set `amount` to current `contribution_type.amount`
+
+**Example (Yearly):**
+
+```
+Joining date: 15.03.2023
+include_joining_period: true
+→ contribution_start_date: 01.01.2023
+
+Generated periods:
+- 01.01.2023 - 31.12.2023 (joining period)
+- 01.01.2024 - 31.12.2024
+- 01.01.2025 - 31.12.2025 (current year)
+```
+
+**Example (Quarterly):**
+
+```
+Joining date: 15.03.2023
+include_joining_period: false
+→ contribution_start_date: 01.04.2023
+
+Generated periods:
+- 01.04.2023 - 30.06.2023 (first full quarter)
+- 01.07.2023 - 30.09.2023
+- 01.10.2023 - 31.12.2023
+- 01.01.2024 - 31.03.2024
+- ...
+```
+
+### Status Transitions
+
+```
+unpaid → paid
+unpaid → suspended
+paid → unpaid
+suspended → paid
+suspended → unpaid
+```
+
+**Permissions:**
+
+- Admin + Treasurer (Kassenwart) can change status
+- Uses existing permission system
+
+### Contribution Type Change
+
+**MVP - Same Interval Only:**
+
+- Member can only choose contribution type with **same interval**
+- Example: From "Regular (yearly)" to "Reduced (yearly)" ✓
+- Example: From "Regular (yearly)" to "Reduced (monthly)" ✗
+
+**Logic on Change:**
+
+1. Check: New contribution type has same interval
+2. If yes: Set `member.contribution_type_id`
+3. Future **unpaid** periods: Delete and regenerate with new amount
+4. Paid/suspended periods: Remain unchanged (historical amount)
+
+**Future - Different Intervals:**
+
+- Enable interval switching (e.g., yearly → monthly)
+- More complex logic for period overlaps
+- Needs additional validation
+
+### Member Exit
+
+**Logic:**
+
+- Periods only generated until `member.left_at`
+- Existing periods remain visible
+- Unpaid exit period can be marked as "suspended"
+
+**Example:**
+
+```
+Exit: 15.08.2024
+Yearly period: 01.01.2024 - 31.12.2024
+
+→ Period 2024 is shown (Status: unpaid)
+→ Admin can set to "suspended"
+→ No periods for 2025+ generated
+```
+
+---
+
+## UI/UX Design
+
+### Member List View
+
+**New Column: "Contribution Status"**
+
+**Default Display (Last Period):**
+
+- Shows status of **last completed** period
+- Example in 2024: Shows contribution for 2023
+- Color coding:
+  - Green: paid ✓
+  - Red: unpaid ✗
+  - Gray: suspended ⊘
+
+**Optional: Show Current Period**
+
+- Toggle: "Show current period" (2024)
+- Admin decides what to display
+
+**Filters:**
+
+- "Unpaid contributions in last period"
+- "Unpaid contributions in current period"
+
+### Member Detail View
+
+**Section: "Contributions"**
+
+**Contribution Type Assignment:**
+
+```
+┌─────────────────────────────────────┐
+│ Contribution Type: [Dropdown]       │
+│ ⚠ Only types with same interval    │
+│   can be selected                   │
+└─────────────────────────────────────┘
+```
+
+**Period Table:**
+
+```
+┌───────────────┬──────────┬────────┬──────────┬─────────┐
+│ Period        │ Interval │ Amount │ Status   │ Action  │
+├───────────────┼──────────┼────────┼──────────┼─────────┤
+│ 01.01.2023-   │ Yearly   │ 50 €   │ ☑ Paid   │         │
+│ 31.12.2023    │          │        │          │         │
+├───────────────┼──────────┼────────┼──────────┼─────────┤
+│ 01.01.2024-   │ Yearly   │ 60 €   │ ☐ Open   │ [Mark   │
+│ 31.12.2024    │          │        │          │ as paid]│
+├───────────────┼──────────┼────────┼──────────┼─────────┤
+│ 01.01.2025-   │ Yearly   │ 60 €   │ ☐ Open   │ [Mark   │
+│ 31.12.2025    │          │        │          │ as paid]│
+└───────────────┴──────────┴────────┴──────────┴─────────┘
+
+Legend: ☑ = paid | ☐ = unpaid | ⊘ = suspended
+```
+
+**Quick Marking:**
+
+- Checkbox in each row for fast marking
+- Button: "Mark selected as paid"
+- Bulk action for multiple periods
+
+### Admin: Contribution Types Management
+
+**List:**
+
+```
+┌────────────┬──────────┬──────────┬────────────┬─────────┐
+│ Name       │ Amount   │ Interval │ Members    │ Actions │
+├────────────┼──────────┼──────────┼────────────┼─────────┤
+│ Regular    │ 60 €     │ Yearly   │ 45         │ [Edit]  │
+│ Reduced    │ 30 €     │ Yearly   │ 12         │ [Edit]  │
+│ Student    │ 20 €     │ Monthly  │ 8          │ [Edit]  │
+└────────────┴──────────┴──────────┴────────────┴─────────┘
+```
+
+**Edit:**
+
+- Name: ✓ editable
+- Amount: ✓ editable
+- Description: ✓ editable
+- Interval: ✗ **NOT** editable (grayed out)
+
+**Warning on Amount Change:**
+
+```
+⚠ Change amount to 65 €?
+  
+Impact:
+- 45 members affected
+- Future unpaid periods will be generated with 65 €
+- Already paid periods remain with old amount
+
+[Cancel] [Confirm]
+```
+
+### Admin: Settings
+
+**Contribution Configuration:**
+
+```
+Default Contribution Type: [Dropdown: Contribution Types]
+
+Selected: "Regular (60 €, Yearly)"
+
+This contribution type is automatically assigned to all new members.
+Can be changed individually per member.
+
+---
+
+☐ Include joining period
+
+When active:
+Members pay from the period of their joining.
+
+Example (Yearly):
+Joining: 15.03.2023
+→ Pays from 2023
+
+When inactive:
+Members pay from the next full period.
+
+Example (Yearly):
+Joining: 15.03.2023
+→ Pays from 2024
+```
+
+---
+
+## Edge Cases
+
+### 1. Contribution Type Change with Different Interval
+
+**MVP:** Blocked (only same interval allowed)
+
+**UI:**
+
+```
+Error: Interval change not possible
+
+Current contribution type: "Regular (Yearly)"
+Selected contribution type: "Student (Monthly)"
+
+Changing the interval is currently not possible.
+Please select a contribution type with interval "Yearly".
+
+[OK]
+```
+
+**Future:**
+
+- Allow interval switching
+- Calculate overlaps
+- Generate new periods without duplicates
+
+### 2. Exit with Unpaid Contributions
+
+**Scenario:**
+
+```
+Member exits: 15.08.2024
+Yearly period 2024: unpaid
+```
+
+**UI Notice on Exit:**
+
+```
+⚠ Unpaid contributions present
+
+This member has 1 unpaid period(s):
+- 2024: 60 € (unpaid)
+
+Do you want to continue?
+
+[ ] Mark contribution as "suspended"
+[Cancel] [Confirm Exit]
+```
+
+### 3. Multiple Unpaid Periods
+
+**Scenario:** Member hasn't paid for 2 years
+
+**Display:**
+
+```
+┌───────────────┬──────────┬────────┬──────────┬─────────┐
+│ 2023          │ Yearly   │ 50 €   │ ☐ Open   │ [✓]     │
+│ 2024          │ Yearly   │ 60 €   │ ☐ Open   │ [✓]     │
+│ 2025          │ Yearly   │ 60 €   │ ☐ Open   │ [ ]     │
+└───────────────┴──────────┴────────┴──────────┴─────────┘
+
+[Mark selected as paid] (2 selected)
+```
+
+### 4. Amount Changes
+
+**Scenario:**
+
+```
+2023: Regular = 50 €
+2024: Regular = 60 € (increase)
+```
+
+**Result:**
+
+- Period 2023: Saved with 50 € (history)
+- Period 2024: Generated with 60 € (current)
+- Both periods show correct historical amount
+
+### 5. Date Boundaries
+
+**Problem:** What if today = 01.01.2025?
+
+**Solution:**
+
+- Current period (2025) is generated
+- Status: unpaid (open)
+- Shown in overview
+
+---
+
+## Implementation Scope
+
+### MVP (Phase 1)
+
+**Included:**
+
+- ✓ Contribution types (CRUD)
+- ✓ Automatic period generation
+- ✓ Status management (paid/unpaid/suspended)
+- ✓ Member overview with contribution status
+- ✓ Period view per member
+- ✓ Quick checkbox marking
+- ✓ Bulk actions
+- ✓ Amount history
+- ✓ Same-interval type change
+- ✓ Default contribution type
+- ✓ Joining period configuration
+
+**NOT Included:**
+
+- ✗ Interval change (only same interval)
+- ✗ Payment details (date, method)
+- ✗ Automatic integration (vereinfacht.digital)
+- ✗ Prorata calculation
+- ✗ Reports/statistics
+- ✗ Reminders/dunning (manual via filters)
+
+### Future Enhancements
+
+**Phase 2:**
+
+- Payment details (date, amount, method)
+- Interval change for future unpaid periods
+- Manual vereinfacht.digital links per member
+- Extended filter options
+
+**Phase 3:**
+
+- Automated vereinfacht.digital integration
+- Automatic payment matching
+- SEPA integration
+- Advanced reports

From 83911224269f3e68aa86834b93244991b2fdbe9e Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Mon, 1 Dec 2025 15:43:04 +0100
Subject: [PATCH 02/12] resolve review issues

---
 docs/contributions-architecture.md | 8 +++++---
 docs/contributions-overview.md     | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/contributions-architecture.md b/docs/contributions-architecture.md
index b01ad30..3718a3b 100644
--- a/docs/contributions-architecture.md
+++ b/docs/contributions-architecture.md
@@ -147,6 +147,7 @@ lib/
 **Existing Fields Used:**
 - `joined_at` - For calculating contribution start
 - `left_at` - For limiting period generation
+- These fields must remain member fields and should not be replaced by custom fields in the future
 
 ### Settings Integration
 
@@ -236,6 +237,7 @@ lib/
 
 **Bulk Operations:**
 - `bulk_mark_as_paid` - Mark multiple periods as paid (efficiency)
+  - low priority, can be a future issue
 
 ### Contribution Type Change Handling
 
@@ -403,7 +405,7 @@ lib/
 
 **AC-UI-MD-1:** Contributions section shows all periods  
 **AC-UI-MD-2:** Table columns: Period, Interval, Amount, Status, Actions  
-**AC-UI-MD-3:** Checkbox per period for bulk marking  
+**AC-UI-MD-3:** Checkbox per period for bulk marking (low prio)  
 **AC-UI-MD-4:** "Mark selected as paid" button  
 **AC-UI-MD-5:** Dropdown to change contribution type (same interval only)  
 **AC-UI-MD-6:** Warning if different interval selected  
@@ -466,7 +468,7 @@ lib/
 
 **Status Management Flow:**
 - Mark single period as paid
-- Bulk mark multiple periods
+- Bulk mark multiple periods (low prio)
 - Status transitions work
 - Permissions enforced
 
@@ -487,7 +489,7 @@ lib/
 **Member Detail:**
 - Periods table displays all periods
 - Checkboxes work
-- Bulk marking works
+- Bulk marking works (low prio)
 - Type change validation works
 - Actions only shown with permission
 
diff --git a/docs/contributions-overview.md b/docs/contributions-overview.md
index 03f347b..e0c4bc8 100644
--- a/docs/contributions-overview.md
+++ b/docs/contributions-overview.md
@@ -321,7 +321,7 @@ Legend: ☑ = paid | ☐ = unpaid | ⊘ = suspended
 **Quick Marking:**
 
 - Checkbox in each row for fast marking
-- Button: "Mark selected as paid"
+- Button: "Mark selected as paid/unpaid/suspended"
 - Bulk action for multiple periods
 
 ### Admin: Contribution Types Management
@@ -426,7 +426,7 @@ Member exits: 15.08.2024
 Yearly period 2024: unpaid
 ```
 
-**UI Notice on Exit:**
+**UI Notice on Exit: (Low Prio)**
 
 ```
 ⚠ Unpaid contributions present
@@ -453,7 +453,7 @@ Do you want to continue?
 │ 2025          │ Yearly   │ 60 €   │ ☐ Open   │ [ ]     │
 └───────────────┴──────────┴────────┴──────────┴─────────┘
 
-[Mark selected as paid] (2 selected)
+[Mark selected as paid/unpaid/suspended] (2 selected)
 ```
 
 ### 4. Amount Changes

From cd1af5aff515ae2dd6e24e2495c3ccd368c0618e Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Tue, 2 Dec 2025 16:39:09 +0100
Subject: [PATCH 03/12] feat: Add contribution management mock-up pages

Add non-functional preview pages for Contribution Types, Settings, and Member Contribution Periods with German translations
---
 docs/feature-roadmap.md                       |   6 +
 lib/mv_web/components/layouts/navbar.ex       |  11 +
 .../live/contribution_period_live/show.ex     | 345 +++++++++++++
 lib/mv_web/live/contribution_settings_live.ex | 277 +++++++++++
 .../live/contribution_type_live/index.ex      | 205 ++++++++
 lib/mv_web/router.ex                          |   5 +
 priv/gettext/de/LC_MESSAGES/default.po        | 451 ++++++++++++++++-
 priv/gettext/default.pot                      | 451 ++++++++++++++++-
 priv/gettext/en/LC_MESSAGES/default.po        | 457 +++++++++++++++++-
 9 files changed, 2187 insertions(+), 21 deletions(-)
 create mode 100644 lib/mv_web/live/contribution_period_live/show.ex
 create mode 100644 lib/mv_web/live/contribution_settings_live.ex
 create mode 100644 lib/mv_web/live/contribution_type_live/index.ex

diff --git a/docs/feature-roadmap.md b/docs/feature-roadmap.md
index 609523c..2f86f5e 100644
--- a/docs/feature-roadmap.md
+++ b/docs/feature-roadmap.md
@@ -187,10 +187,16 @@
 
 **Current State:**
 - ✅ Basic "paid" boolean field on members
+- ✅ **UI Mock-ups for Contribution Types & Settings** (2025-12-02)
 - ⚠️ No payment tracking
 
 **Open Issues:**
 - [#156](https://git.local-it.org/local-it/mitgliederverwaltung/issues/156) - Set up & document testing environment for vereinfacht.digital (L, Low priority)
+- [#226](https://git.local-it.org/local-it/mitgliederverwaltung/issues/226) - Payment/Contribution Mockup Pages (Preview)
+
+**Mock-Up Pages (Non-Functional Preview):**
+- `/contribution_types` - Contribution Types Management
+- `/contribution_settings` - Global Contribution Settings
 
 **Missing Features:**
 - ❌ Membership fee configuration
diff --git a/lib/mv_web/components/layouts/navbar.ex b/lib/mv_web/components/layouts/navbar.ex
index 7ff7f25..1c1138e 100644
--- a/lib/mv_web/components/layouts/navbar.ex
+++ b/lib/mv_web/components/layouts/navbar.ex
@@ -25,6 +25,17 @@ defmodule MvWeb.Layouts.Navbar do
           <li><.link navigate="/members">{gettext("Members")}</.link></li>
           <li><.link navigate="/custom_fields">{gettext("Custom Fields")}</.link></li>
           <li><.link navigate="/users">{gettext("Users")}</.link></li>
+          <li>
+            <details>
+              <summary>{gettext("Contributions")}</summary>
+              <ul class="bg-base-200 rounded-t-none p-2 z-10 w-48">
+                <li><.link navigate="/contribution_types">{gettext("Contribution Types")}</.link></li>
+                <li>
+                  <.link navigate="/contribution_settings">{gettext("Contribution Settings")}</.link>
+                </li>
+              </ul>
+            </details>
+          </li>
         </ul>
       </div>
       <div class="flex gap-2">
diff --git a/lib/mv_web/live/contribution_period_live/show.ex b/lib/mv_web/live/contribution_period_live/show.ex
new file mode 100644
index 0000000..95179ac
--- /dev/null
+++ b/lib/mv_web/live/contribution_period_live/show.ex
@@ -0,0 +1,345 @@
+defmodule MvWeb.ContributionPeriodLive.Show do
+  @moduledoc """
+  Mock-up LiveView for Member Contribution Periods (Admin/Treasurer View).
+
+  This is a preview-only page that displays the planned UI for viewing
+  and managing contribution periods for a specific member.
+  It shows static mock data and is not functional.
+
+  ## Planned Features (Future Implementation)
+  - Display all contribution periods for a member
+  - Show period dates, interval, amount, and status
+  - Quick status change (paid/unpaid/suspended)
+  - Bulk marking of multiple periods
+  - Notes per period
+
+  ## Note
+  This page is intentionally non-functional and serves as a UI mockup
+  for the upcoming Membership Contributions feature.
+  """
+  use MvWeb, :live_view
+
+  @impl true
+  def mount(_params, _session, socket) do
+    {:ok,
+     socket
+     |> assign(:page_title, gettext("Member Contributions"))
+     |> assign(:member, mock_member())
+     |> assign(:periods, mock_periods())
+     |> assign(:selected_periods, MapSet.new())}
+  end
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <Layouts.app flash={@flash} current_user={@current_user}>
+      <.mockup_warning />
+
+      <.header>
+        {gettext("Contributions for %{name}", name: "#{@member.first_name} #{@member.last_name}")}
+        <:subtitle>
+          {gettext("Contribution type")}:
+          <span class="font-semibold">{@member.contribution_type}</span>
+          · {gettext("Member since")}: <span class="font-mono">{@member.joined_at}</span>
+        </:subtitle>
+        <:actions>
+          <.link navigate={~p"/contribution_settings"} class="btn btn-ghost btn-sm">
+            <.icon name="hero-arrow-left" class="size-4" />
+            {gettext("Back to Settings")}
+          </.link>
+        </:actions>
+      </.header>
+
+      <%!-- Member Info Card --%>
+      <div class="mb-6 shadow card bg-base-100">
+        <div class="card-body">
+          <div class="grid grid-cols-2 gap-4 md:grid-cols-4">
+            <div>
+              <span class="text-sm text-base-content/60">{gettext("Email")}</span>
+              <p class="font-medium">{@member.email}</p>
+            </div>
+            <div>
+              <span class="text-sm text-base-content/60">{gettext("Contribution Start")}</span>
+              <p class="font-mono">{@member.contribution_start}</p>
+            </div>
+            <div>
+              <span class="text-sm text-base-content/60">{gettext("Total Contributions")}</span>
+              <p class="font-semibold">{length(@periods)}</p>
+            </div>
+            <div>
+              <span class="text-sm text-base-content/60">{gettext("Open Contributions")}</span>
+              <p class="font-semibold text-error">
+                {Enum.count(@periods, &(&1.status == :unpaid))}
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <%!-- Contribution Type Change --%>
+      <div class="mb-6 card bg-base-200">
+        <div class="py-4 card-body">
+          <div class="flex flex-wrap items-center gap-4">
+            <span class="font-semibold">{gettext("Change Contribution Type")}:</span>
+            <select class="w-64 select select-bordered select-sm" disabled>
+              <option selected>{@member.contribution_type} (60,00 €, {gettext("Yearly")})</option>
+              <option>{gettext("Reduced")} (30,00 €, {gettext("Yearly")})</option>
+              <option>{gettext("Honorary")} (0,00 €, {gettext("Yearly")})</option>
+            </select>
+            <span
+              class="text-sm text-base-content/60 cursor-help tooltip tooltip-bottom"
+              data-tip={
+                gettext(
+                  "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
+                )
+              }
+            >
+              <.icon name="hero-question-mark-circle" class="inline size-4" />
+              {gettext("Why are not all contribution types shown?")}
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <%!-- Bulk Actions --%>
+      <div class="flex flex-wrap items-center gap-4 mb-4">
+        <span class="text-sm text-base-content/60">
+          {ngettext(
+            "%{count} period selected",
+            "%{count} periods selected",
+            MapSet.size(@selected_periods),
+            count: MapSet.size(@selected_periods)
+          )}
+        </span>
+        <button class="btn btn-sm btn-success" disabled>
+          <.icon name="hero-check" class="size-4" />
+          {gettext("Mark as Paid")}
+        </button>
+        <button class="btn btn-sm btn-ghost" disabled>
+          <.icon name="hero-minus-circle" class="size-4" />
+          {gettext("Mark as Suspended")}
+        </button>
+        <button class="btn btn-sm btn-ghost" disabled>
+          <.icon name="hero-x-circle" class="size-4" />
+          {gettext("Mark as Unpaid")}
+        </button>
+      </div>
+
+      <%!-- Periods Table --%>
+      <div class="overflow-x-auto">
+        <table class="table table-zebra">
+          <thead>
+            <tr>
+              <th>
+                <input type="checkbox" class="checkbox checkbox-sm" disabled />
+              </th>
+              <th>{gettext("Time Period")}</th>
+              <th>{gettext("Interval")}</th>
+              <th>{gettext("Amount")}</th>
+              <th>{gettext("Status")}</th>
+              <th>{gettext("Notes")}</th>
+              <th>{gettext("Actions")}</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr :for={period <- @periods} class={period_row_class(period.status)}>
+              <td>
+                <input
+                  type="checkbox"
+                  class="checkbox checkbox-sm"
+                  checked={MapSet.member?(@selected_periods, period.id)}
+                  disabled
+                />
+              </td>
+              <td>
+                <div class="font-mono">
+                  {period.period_start} – {period.period_end}
+                </div>
+                <div :if={period.is_current} class="mt-1 badge badge-info badge-sm">
+                  {gettext("Current")}
+                </div>
+              </td>
+              <td>
+                <span class="badge badge-outline badge-sm">{format_interval(period.interval)}</span>
+              </td>
+              <td>
+                <span class="font-mono">{format_currency(period.amount)}</span>
+              </td>
+              <td>
+                <.status_badge status={period.status} />
+              </td>
+              <td>
+                <span :if={period.notes} class="text-sm italic text-base-content/60">
+                  {period.notes}
+                </span>
+                <span :if={!period.notes} class="text-base-content/30">—</span>
+              </td>
+              <td class="w-0 font-semibold whitespace-nowrap">
+                <div class="flex gap-4">
+                  <.link
+                    href="#"
+                    class={[
+                      "cursor-not-allowed",
+                      if(period.status == :paid, do: "invisible", else: "opacity-50")
+                    ]}
+                  >
+                    {gettext("Paid")}
+                  </.link>
+                  <.link
+                    href="#"
+                    class={[
+                      "cursor-not-allowed",
+                      if(period.status == :suspended, do: "invisible", else: "opacity-50")
+                    ]}
+                  >
+                    {gettext("Suspend")}
+                  </.link>
+                  <.link
+                    href="#"
+                    class={[
+                      "cursor-not-allowed",
+                      if(period.status != :paid, do: "invisible", else: "opacity-50")
+                    ]}
+                  >
+                    {gettext("Reopen")}
+                  </.link>
+                  <.link href="#" class="opacity-50 cursor-not-allowed">
+                    {gettext("Note")}
+                  </.link>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </Layouts.app>
+    """
+  end
+
+  # Mock-up warning banner component - subtle orange style
+  defp mockup_warning(assigns) do
+    ~H"""
+    <div class="flex items-center gap-3 px-4 py-3 mb-6 border rounded-lg border-warning text-warning bg-base-100">
+      <.icon name="hero-exclamation-triangle" class="size-5 shrink-0" />
+      <div>
+        <span class="font-semibold">{gettext("Preview Mockup")}</span>
+        <span class="ml-2 text-sm text-base-content/70">
+          – {gettext("This page is not functional and only displays the planned features.")}
+        </span>
+      </div>
+    </div>
+    """
+  end
+
+  # Status badge component
+  attr :status, :atom, required: true
+
+  defp status_badge(%{status: :paid} = assigns) do
+    ~H"""
+    <span class="gap-1 badge badge-success">
+      <.icon name="hero-check-circle-mini" class="size-3" />
+      {gettext("Paid")}
+    </span>
+    """
+  end
+
+  defp status_badge(%{status: :unpaid} = assigns) do
+    ~H"""
+    <span class="gap-1 badge badge-error">
+      <.icon name="hero-x-circle-mini" class="size-3" />
+      {gettext("Unpaid")}
+    </span>
+    """
+  end
+
+  defp status_badge(%{status: :suspended} = assigns) do
+    ~H"""
+    <span class="gap-1 badge badge-neutral">
+      <.icon name="hero-pause-circle-mini" class="size-3" />
+      {gettext("Suspended")}
+    </span>
+    """
+  end
+
+  defp period_row_class(:unpaid), do: "bg-error/5"
+  defp period_row_class(:suspended), do: "bg-base-200/50"
+  defp period_row_class(_), do: ""
+
+  # Mock member data
+  defp mock_member do
+    %{
+      id: "123",
+      first_name: "Maria",
+      last_name: "Weber",
+      email: "maria.weber@example.de",
+      contribution_type: gettext("Regular"),
+      joined_at: "15.03.2021",
+      contribution_start: "01.01.2021"
+    }
+  end
+
+  # Mock periods data
+  defp mock_periods do
+    [
+      %{
+        id: "p1",
+        period_start: "01.01.2025",
+        period_end: "31.12.2025",
+        interval: :yearly,
+        amount: Decimal.new("60.00"),
+        status: :unpaid,
+        notes: nil,
+        is_current: true
+      },
+      %{
+        id: "p2",
+        period_start: "01.01.2024",
+        period_end: "31.12.2024",
+        interval: :yearly,
+        amount: Decimal.new("60.00"),
+        status: :paid,
+        notes: gettext("Paid via bank transfer"),
+        is_current: false
+      },
+      %{
+        id: "p3",
+        period_start: "01.01.2023",
+        period_end: "31.12.2023",
+        interval: :yearly,
+        amount: Decimal.new("50.00"),
+        status: :paid,
+        notes: nil,
+        is_current: false
+      },
+      %{
+        id: "p4",
+        period_start: "01.01.2022",
+        period_end: "31.12.2022",
+        interval: :yearly,
+        amount: Decimal.new("50.00"),
+        status: :paid,
+        notes: nil,
+        is_current: false
+      },
+      %{
+        id: "p5",
+        period_start: "01.01.2021",
+        period_end: "31.12.2021",
+        interval: :yearly,
+        amount: Decimal.new("50.00"),
+        status: :suspended,
+        notes: gettext("Joining year - reduced to 0"),
+        is_current: false
+      }
+    ]
+  end
+
+  defp format_currency(%Decimal{} = amount) do
+    "#{Decimal.to_string(amount)} €"
+  end
+
+  defp format_interval(:monthly), do: gettext("Monthly")
+  defp format_interval(:quarterly), do: gettext("Quarterly")
+  defp format_interval(:half_yearly), do: gettext("Half-yearly")
+  defp format_interval(:yearly), do: gettext("Yearly")
+end
diff --git a/lib/mv_web/live/contribution_settings_live.ex b/lib/mv_web/live/contribution_settings_live.ex
new file mode 100644
index 0000000..713bc8c
--- /dev/null
+++ b/lib/mv_web/live/contribution_settings_live.ex
@@ -0,0 +1,277 @@
+defmodule MvWeb.ContributionSettingsLive do
+  @moduledoc """
+  Mock-up LiveView for Contribution Settings (Admin).
+
+  This is a preview-only page that displays the planned UI for managing
+  global contribution settings. It shows static mock data and is not functional.
+
+  ## Planned Features (Future Implementation)
+  - Set default contribution type for new members
+  - Configure whether joining period is included in contributions
+  - Explanatory text with examples
+
+  ## Settings
+  - `default_contribution_type_id` - UUID of the default contribution type
+  - `include_joining_period` - Boolean whether to include joining period
+
+  ## Note
+  This page is intentionally non-functional and serves as a UI mockup
+  for the upcoming Membership Contributions feature.
+  """
+  use MvWeb, :live_view
+
+  @impl true
+  def mount(_params, _session, socket) do
+    {:ok,
+     socket
+     |> assign(:page_title, gettext("Contribution Settings"))
+     |> assign(:contribution_types, mock_contribution_types())
+     |> assign(:selected_type_id, "1")
+     |> assign(:include_joining_period, true)}
+  end
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <Layouts.app flash={@flash} current_user={@current_user}>
+      <.mockup_warning />
+
+      <.header>
+        {gettext("Contribution Settings")}
+        <:subtitle>
+          {gettext("Configure global settings for membership contributions.")}
+        </:subtitle>
+      </.header>
+
+      <div class="grid gap-6 lg:grid-cols-2">
+        <%!-- Settings Form --%>
+        <div class="card bg-base-100 shadow-xl">
+          <div class="card-body">
+            <h2 class="card-title">
+              <.icon name="hero-cog-6-tooth" class="size-5" />
+              {gettext("Global Settings")}
+            </h2>
+
+            <form class="space-y-6">
+              <%!-- Default Contribution Type --%>
+              <fieldset class="fieldset">
+                <label class="label">
+                  <span class="label-text font-semibold">
+                    {gettext("Default Contribution Type")}
+                  </span>
+                </label>
+                <select class="select select-bordered w-full" disabled>
+                  <option :for={ct <- @contribution_types} selected={ct.id == @selected_type_id}>
+                    {ct.name} ({format_currency(ct.amount)}, {format_interval(ct.interval)})
+                  </option>
+                </select>
+                <p class="text-sm text-base-content/60 mt-2">
+                  {gettext(
+                    "This contribution type is automatically assigned to all new members. Can be changed individually per member."
+                  )}
+                </p>
+              </fieldset>
+
+              <%!-- Include Joining Period --%>
+              <fieldset class="fieldset">
+                <label class="label cursor-pointer justify-start gap-3">
+                  <input
+                    type="checkbox"
+                    class="checkbox checkbox-primary"
+                    checked={@include_joining_period}
+                    disabled
+                  />
+                  <span class="label-text font-semibold">
+                    {gettext("Include joining period")}
+                  </span>
+                </label>
+                <div class="ml-9 space-y-2">
+                  <p class="text-sm text-base-content/60">
+                    {gettext("When active: Members pay from the period of their joining.")}
+                  </p>
+                  <p class="text-sm text-base-content/60">
+                    {gettext("When inactive: Members pay from the next full period after joining.")}
+                  </p>
+                </div>
+              </fieldset>
+
+              <div class="divider"></div>
+
+              <button type="button" class="btn btn-primary w-full" disabled>
+                <.icon name="hero-check" class="size-5" />
+                {gettext("Save Settings")}
+              </button>
+            </form>
+          </div>
+        </div>
+
+        <%!-- Examples Card --%>
+        <div class="card bg-base-200">
+          <div class="card-body">
+            <h2 class="card-title">
+              <.icon name="hero-light-bulb" class="size-5" />
+              {gettext("Examples")}
+            </h2>
+
+            <.example_section
+              title={gettext("Yearly Interval - Joining Period Included")}
+              joining_date="15.03.2023"
+              include_joining={true}
+              start_date="01.01.2023"
+              periods={["2023", "2024", "2025"]}
+              note={gettext("Member pays for the year they joined")}
+            />
+
+            <div class="divider"></div>
+
+            <.example_section
+              title={gettext("Yearly Interval - Joining Period Excluded")}
+              joining_date="15.03.2023"
+              include_joining={false}
+              start_date="01.01.2024"
+              periods={["2024", "2025"]}
+              note={gettext("Member pays from the next full year")}
+            />
+
+            <div class="divider"></div>
+
+            <.example_section
+              title={gettext("Quarterly Interval - Joining Period Excluded")}
+              joining_date="15.05.2024"
+              include_joining={false}
+              start_date="01.07.2024"
+              periods={["Q3/2024", "Q4/2024", "Q1/2025"]}
+              note={gettext("Member pays from the next full quarter")}
+            />
+
+            <div class="divider"></div>
+
+            <.example_section
+              title={gettext("Monthly Interval - Joining Period Included")}
+              joining_date="15.03.2024"
+              include_joining={true}
+              start_date="01.03.2024"
+              periods={["03/2024", "04/2024", "05/2024", "..."]}
+              note={gettext("Member pays from the joining month")}
+            />
+          </div>
+        </div>
+      </div>
+
+      <.example_member_card />
+    </Layouts.app>
+    """
+  end
+
+  # Example member card with link to period view
+  defp example_member_card(assigns) do
+    ~H"""
+    <div class="card bg-base-100 shadow-xl mt-6">
+      <div class="card-body">
+        <h2 class="card-title">
+          <.icon name="hero-user" class="size-5" />
+          {gettext("Example: Member Contribution View")}
+        </h2>
+        <p class="text-base-content/70">
+          {gettext(
+            "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
+          )}
+        </p>
+        <div class="card-actions justify-end">
+          <.link navigate={~p"/contributions/member/example"} class="btn btn-primary btn-sm">
+            <.icon name="hero-eye" class="size-4" />
+            {gettext("View Example Member")}
+          </.link>
+        </div>
+      </div>
+    </div>
+    """
+  end
+
+  # Mock-up warning banner component - subtle orange style
+  defp mockup_warning(assigns) do
+    ~H"""
+    <div class="border border-warning text-warning bg-base-100 rounded-lg px-4 py-3 mb-6 flex items-center gap-3">
+      <.icon name="hero-exclamation-triangle" class="size-5 shrink-0" />
+      <div>
+        <span class="font-semibold">{gettext("Preview Mockup")}</span>
+        <span class="text-sm text-base-content/70 ml-2">
+          – {gettext("This page is not functional and only displays the planned features.")}
+        </span>
+      </div>
+    </div>
+    """
+  end
+
+  # Example section component
+  attr :title, :string, required: true
+  attr :joining_date, :string, required: true
+  attr :include_joining, :boolean, required: true
+  attr :start_date, :string, required: true
+  attr :periods, :list, required: true
+  attr :note, :string, required: true
+
+  defp example_section(assigns) do
+    ~H"""
+    <div class="space-y-2">
+      <h3 class="font-semibold text-sm">{@title}</h3>
+      <div class="bg-base-300 rounded-lg p-3 text-sm space-y-1">
+        <p>
+          <span class="text-base-content/60">{gettext("Joining date")}:</span>
+          <span class="font-mono">{@joining_date}</span>
+        </p>
+        <p>
+          <span class="text-base-content/60">{gettext("Contribution start")}:</span>
+          <span class="font-mono font-semibold text-primary">{@start_date}</span>
+        </p>
+        <p>
+          <span class="text-base-content/60">{gettext("Generated periods")}:</span>
+          <span class="font-mono">
+            {Enum.join(@periods, ", ")}
+          </span>
+        </p>
+      </div>
+      <p class="text-xs text-base-content/60 italic">→ {@note}</p>
+    </div>
+    """
+  end
+
+  # Mock data for demonstration
+  defp mock_contribution_types do
+    [
+      %{
+        id: "1",
+        name: gettext("Regular"),
+        amount: Decimal.new("60.00"),
+        interval: :yearly
+      },
+      %{
+        id: "2",
+        name: gettext("Reduced"),
+        amount: Decimal.new("30.00"),
+        interval: :yearly
+      },
+      %{
+        id: "3",
+        name: gettext("Student"),
+        amount: Decimal.new("5.00"),
+        interval: :monthly
+      },
+      %{
+        id: "4",
+        name: gettext("Family"),
+        amount: Decimal.new("25.00"),
+        interval: :quarterly
+      }
+    ]
+  end
+
+  defp format_currency(%Decimal{} = amount) do
+    "#{Decimal.to_string(amount)} €"
+  end
+
+  defp format_interval(:monthly), do: gettext("Monthly")
+  defp format_interval(:quarterly), do: gettext("Quarterly")
+  defp format_interval(:half_yearly), do: gettext("Half-yearly")
+  defp format_interval(:yearly), do: gettext("Yearly")
+end
diff --git a/lib/mv_web/live/contribution_type_live/index.ex b/lib/mv_web/live/contribution_type_live/index.ex
new file mode 100644
index 0000000..9a7b602
--- /dev/null
+++ b/lib/mv_web/live/contribution_type_live/index.ex
@@ -0,0 +1,205 @@
+defmodule MvWeb.ContributionTypeLive.Index do
+  @moduledoc """
+  Mock-up LiveView for Contribution Types Management (Admin).
+
+  This is a preview-only page that displays the planned UI for managing
+  contribution types. It shows static mock data and is not functional.
+
+  ## Planned Features (Future Implementation)
+  - List all contribution types
+  - Display: Name, Amount, Interval, Member count
+  - Create new contribution types
+  - Edit existing contribution types (name, amount, description - NOT interval)
+  - Delete contribution types (if no members assigned)
+
+  ## Note
+  This page is intentionally non-functional and serves as a UI mockup
+  for the upcoming Membership Contributions feature.
+  """
+  use MvWeb, :live_view
+
+  @impl true
+  def mount(_params, _session, socket) do
+    {:ok,
+     socket
+     |> assign(:page_title, gettext("Contribution Types"))
+     |> assign(:contribution_types, mock_contribution_types())}
+  end
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <Layouts.app flash={@flash} current_user={@current_user}>
+      <.mockup_warning />
+
+      <.header>
+        {gettext("Contribution Types")}
+        <:subtitle>
+          {gettext("Manage contribution types for membership fees.")}
+        </:subtitle>
+        <:actions>
+          <button class="btn btn-primary" disabled>
+            <.icon name="hero-plus" /> {gettext("New Contribution Type")}
+          </button>
+        </:actions>
+      </.header>
+
+      <.table id="contribution_types" rows={@contribution_types} row_id={fn ct -> "ct-#{ct.id}" end}>
+        <:col :let={ct} label={gettext("Name")}>
+          <span class="font-medium">{ct.name}</span>
+          <p :if={ct.description} class="text-sm text-base-content/60">{ct.description}</p>
+        </:col>
+
+        <:col :let={ct} label={gettext("Amount")}>
+          <span class="font-mono">{format_currency(ct.amount)}</span>
+        </:col>
+
+        <:col :let={ct} label={gettext("Interval")}>
+          <span class="badge badge-outline">{format_interval(ct.interval)}</span>
+        </:col>
+
+        <:col :let={ct} label={gettext("Members")}>
+          <span class="badge badge-ghost">{ct.member_count}</span>
+        </:col>
+
+        <:action :let={_ct}>
+          <button class="btn btn-ghost btn-xs" disabled title={gettext("Edit")}>
+            <.icon name="hero-pencil" class="size-4" />
+          </button>
+        </:action>
+
+        <:action :let={ct}>
+          <button
+            class="btn btn-ghost btn-xs text-error"
+            disabled
+            title={
+              if ct.member_count > 0,
+                do: gettext("Cannot delete - members assigned"),
+                else: gettext("Delete")
+            }
+          >
+            <.icon name="hero-trash" class="size-4" />
+          </button>
+        </:action>
+      </.table>
+
+      <.info_card />
+    </Layouts.app>
+    """
+  end
+
+  # Mock-up warning banner component - subtle orange style
+  defp mockup_warning(assigns) do
+    ~H"""
+    <div class="border border-warning text-warning bg-base-100 rounded-lg px-4 py-3 mb-6 flex items-center gap-3">
+      <.icon name="hero-exclamation-triangle" class="size-5 shrink-0" />
+      <div>
+        <span class="font-semibold">{gettext("Preview Mockup")}</span>
+        <span class="text-sm text-base-content/70 ml-2">
+          – {gettext("This page is not functional and only displays the planned features.")}
+        </span>
+      </div>
+    </div>
+    """
+  end
+
+  # Info card explaining the contribution type concept
+  defp info_card(assigns) do
+    ~H"""
+    <div class="card bg-base-200 mt-6">
+      <div class="card-body">
+        <h2 class="card-title">
+          <.icon name="hero-information-circle" class="size-5" />
+          {gettext("About Contribution Types")}
+        </h2>
+        <div class="prose prose-sm max-w-none">
+          <p>
+            {gettext(
+              "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+            )}
+          </p>
+          <ul>
+            <li>
+              <strong>{gettext("Name & Amount")}</strong>
+              - {gettext("Can be changed at any time. Amount changes affect future periods only.")}
+            </li>
+            <li>
+              <strong>{gettext("Interval")}</strong>
+              - {gettext(
+                "Fixed after creation. Members can only switch between types with the same interval."
+              )}
+            </li>
+            <li>
+              <strong>{gettext("Deletion")}</strong>
+              - {gettext("Only possible if no members are assigned to this type.")}
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    """
+  end
+
+  # Mock data for demonstration
+  defp mock_contribution_types do
+    [
+      %{
+        id: "1",
+        name: gettext("Regular"),
+        description: gettext("Standard membership fee for regular members"),
+        amount: Decimal.new("60.00"),
+        interval: :yearly,
+        member_count: 45
+      },
+      %{
+        id: "2",
+        name: gettext("Reduced"),
+        description: gettext("Reduced fee for unemployed, pensioners, or low income"),
+        amount: Decimal.new("30.00"),
+        interval: :yearly,
+        member_count: 12
+      },
+      %{
+        id: "3",
+        name: gettext("Student"),
+        description: gettext("Monthly fee for students and trainees"),
+        amount: Decimal.new("5.00"),
+        interval: :monthly,
+        member_count: 8
+      },
+      %{
+        id: "4",
+        name: gettext("Family"),
+        description: gettext("Quarterly fee for family memberships"),
+        amount: Decimal.new("25.00"),
+        interval: :quarterly,
+        member_count: 15
+      },
+      %{
+        id: "5",
+        name: gettext("Supporting Member"),
+        description: gettext("Half-yearly contribution for supporting members"),
+        amount: Decimal.new("100.00"),
+        interval: :half_yearly,
+        member_count: 3
+      },
+      %{
+        id: "6",
+        name: gettext("Honorary"),
+        description: gettext("No fee for honorary members"),
+        amount: Decimal.new("0.00"),
+        interval: :yearly,
+        member_count: 2
+      }
+    ]
+  end
+
+  defp format_currency(%Decimal{} = amount) do
+    "#{Decimal.to_string(amount)} €"
+  end
+
+  defp format_interval(:monthly), do: gettext("Monthly")
+  defp format_interval(:quarterly), do: gettext("Quarterly")
+  defp format_interval(:half_yearly), do: gettext("Half-yearly")
+  defp format_interval(:yearly), do: gettext("Yearly")
+end
diff --git a/lib/mv_web/router.ex b/lib/mv_web/router.ex
index 09a2792..c574e17 100644
--- a/lib/mv_web/router.ex
+++ b/lib/mv_web/router.ex
@@ -75,6 +75,11 @@ defmodule MvWeb.Router do
 
       live "/settings", GlobalSettingsLive
 
+      # Contribution Management (Mock-ups)
+      live "/contribution_types", ContributionTypeLive.Index, :index
+      live "/contribution_settings", ContributionSettingsLive
+      live "/contributions/member/:id", ContributionPeriodLive.Show, :show
+
       post "/set_locale", LocaleController, :set_locale
     end
 
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 66bcec1..be7ffef 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -11,6 +11,7 @@ msgstr ""
 "Language: en\n"
 
 #: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/live/contribution_period_live/show.ex:141
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr "Aktionen"
@@ -34,12 +35,14 @@ msgstr "Verbindung wird wiederhergestellt"
 msgid "City"
 msgstr "Stadt"
 
+#: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
 #: lib/mv_web/live/user_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr "Löschen"
 
+#: lib/mv_web/live/contribution_type_live/index.ex:66
 #: lib/mv_web/live/member_live/index.html.heex:242
 #: lib/mv_web/live/user_live/form.ex:265
 #: lib/mv_web/live/user_live/index.html.heex:66
@@ -53,6 +56,7 @@ msgstr "Bearbeiten"
 msgid "Edit Member"
 msgstr "Mitglied bearbeiten"
 
+#: lib/mv_web/live/contribution_period_live/show.ex:58
 #: lib/mv_web/live/member_live/form.ex:47
 #: lib/mv_web/live/member_live/index.html.heex:112
 #: lib/mv_web/live/member_live/show.ex:50
@@ -121,6 +125,7 @@ msgstr "Austrittsdatum"
 msgid "House Number"
 msgstr "Hausnummer"
 
+#: lib/mv_web/live/contribution_period_live/show.ex:140
 #: lib/mv_web/live/member_live/form.ex:52
 #: lib/mv_web/live/member_live/show.ex:57
 #, elixir-autogen, elixir-format
@@ -129,6 +134,8 @@ msgstr "Notizen"
 
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
+#: lib/mv_web/live/contribution_period_live/show.ex:186
+#: lib/mv_web/live/contribution_period_live/show.ex:242
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/show.ex:51
@@ -288,7 +295,7 @@ msgstr "ID"
 msgid "Immutable"
 msgstr "Unveränderlich"
 
-#: lib/mv_web/components/layouts/navbar.ex:102
+#: lib/mv_web/components/layouts/navbar.ex:113
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr "Abmelden"
@@ -305,12 +312,14 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: lib/mv_web/components/layouts/navbar.ex:25
+#: lib/mv_web/live/contribution_type_live/index.ex:61
 #: lib/mv_web/live/member_live/index.ex:73
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr "Mitglieder"
 
+#: lib/mv_web/live/contribution_type_live/index.ex:48
 #: lib/mv_web/live/custom_field_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -331,6 +340,7 @@ msgstr "Nicht aktiviert"
 msgid "Not set"
 msgstr "Nicht gesetzt"
 
+#: lib/mv_web/live/contribution_period_live/show.ex:207
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -349,7 +359,7 @@ msgstr "OIDC ID"
 msgid "Password Authentication"
 msgstr "Passwort-Authentifizierung"
 
-#: lib/mv_web/components/layouts/navbar.ex:95
+#: lib/mv_web/components/layouts/navbar.ex:106
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr "Profil"
@@ -369,7 +379,7 @@ msgstr "Alle Mitglieder auswählen"
 msgid "Select member"
 msgstr "Mitglied auswählen"
 
-#: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/components/layouts/navbar.ex:110
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr "Einstellungen"
@@ -537,14 +547,14 @@ msgstr "Zurück zur Mitgliederliste"
 msgid "Back to users list"
 msgstr "Zurück zur Benutzer*innen-Liste"
 
-#: lib/mv_web/components/layouts/navbar.ex:33
-#: lib/mv_web/components/layouts/navbar.ex:39
+#: lib/mv_web/components/layouts/navbar.ex:44
+#: lib/mv_web/components/layouts/navbar.ex:50
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr "Sprache auswählen"
 
-#: lib/mv_web/components/layouts/navbar.ex:46
-#: lib/mv_web/components/layouts/navbar.ex:66
+#: lib/mv_web/components/layouts/navbar.ex:57
+#: lib/mv_web/components/layouts/navbar.ex:77
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr "Dunklen Modus umschalten"
@@ -716,6 +726,7 @@ msgstr "Vereinsdaten"
 msgid "Manage global settings for the association."
 msgstr "Passe übergreifende Einstellungen für den Verein an."
 
+#: lib/mv_web/live/contribution_settings_live.ex:102
 #: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
@@ -853,6 +864,432 @@ msgstr "Nicht bezahlt"
 msgid "Payment filter"
 msgstr "Zahlungsfilter"
 
+#: lib/mv_web/live/contribution_period_live/show.ex:107
+#, elixir-autogen, elixir-format
+msgid "%{count} period selected"
+msgid_plural "%{count} periods selected"
+msgstr[0] "%{count} Beiträge ausgewählt"
+msgstr[1] "%{count} Beiträge ausgewählt"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:113
+#, elixir-autogen, elixir-format
+msgid "About Contribution Types"
+msgstr "Über Beitragsarten"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:138
+#: lib/mv_web/live/contribution_type_live/index.ex:53
+#, elixir-autogen, elixir-format
+msgid "Amount"
+msgstr "Betrag"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:48
+#, elixir-autogen, elixir-format
+msgid "Back to Settings"
+msgstr "Zurück zu Einstellungen"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:124
+#, elixir-autogen, elixir-format
+msgid "Can be changed at any time. Amount changes affect future periods only."
+msgstr "Kann jederzeit geändert werden. Betragsänderungen wirken sich nur auf zukünftige Beiträge aus."
+
+#: lib/mv_web/live/contribution_type_live/index.ex:77
+#, elixir-autogen, elixir-format
+msgid "Cannot delete - members assigned"
+msgstr "Löschen nicht möglich - Mitglieder zugewiesen"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:83
+#, elixir-autogen, elixir-format
+msgid "Change Contribution Type"
+msgstr "Beitragsart ändern"
+
+#: lib/mv_web/live/contribution_settings_live.ex:42
+#, elixir-autogen, elixir-format
+msgid "Configure global settings for membership contributions."
+msgstr "Globale Einstellungen für Mitgliedsbeiträge konfigurieren."
+
+#: lib/mv_web/components/layouts/navbar.ex:34
+#: lib/mv_web/live/contribution_settings_live.ex:27
+#: lib/mv_web/live/contribution_settings_live.ex:40
+#, elixir-autogen, elixir-format
+msgid "Contribution Settings"
+msgstr "Beitragseinstellungen"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:62
+#, elixir-autogen, elixir-format
+msgid "Contribution Start"
+msgstr "Beitragsbeginn"
+
+#: lib/mv_web/components/layouts/navbar.ex:32
+#: lib/mv_web/live/contribution_type_live/index.ex:25
+#: lib/mv_web/live/contribution_type_live/index.ex:36
+#, elixir-autogen, elixir-format
+msgid "Contribution Types"
+msgstr "Beitragsarten"
+
+#: lib/mv_web/live/contribution_settings_live.ex:224
+#, elixir-autogen, elixir-format
+msgid "Contribution start"
+msgstr "Beitragsbeginn"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:41
+#, elixir-autogen, elixir-format
+msgid "Contribution type"
+msgstr "Beitragsart"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:117
+#, elixir-autogen, elixir-format
+msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+msgstr "Beitragsarten definieren verschiedene Mitgliedsbeitragsstrukturen. Jede Art hat ein festes Intervall (monatlich, quartalsweise, halbjährlich, jährlich), das nach der Erstellung nicht mehr geändert werden kann."
+
+#: lib/mv_web/components/layouts/navbar.ex:30
+#, elixir-autogen, elixir-format
+msgid "Contributions"
+msgstr "Beiträge"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:39
+#, elixir-autogen, elixir-format
+msgid "Contributions for %{name}"
+msgstr "Beiträge für %{name}"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:159
+#, elixir-autogen, elixir-format
+msgid "Current"
+msgstr "Aktuell"
+
+#: lib/mv_web/live/contribution_settings_live.ex:60
+#, elixir-autogen, elixir-format
+msgid "Default Contribution Type"
+msgstr "Standard-Beitragsart"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:133
+#, elixir-autogen, elixir-format
+msgid "Deletion"
+msgstr "Löschung"
+
+#: lib/mv_web/live/contribution_settings_live.ex:173
+#, elixir-autogen, elixir-format
+msgid "Example: Member Contribution View"
+msgstr "Beispiel: Mitglieder-Beitragsansicht"
+
+#: lib/mv_web/live/contribution_settings_live.ex:113
+#, elixir-autogen, elixir-format
+msgid "Examples"
+msgstr "Beispiele"
+
+#: lib/mv_web/live/contribution_settings_live.ex:262
+#: lib/mv_web/live/contribution_type_live/index.ex:172
+#, elixir-autogen, elixir-format
+msgid "Family"
+msgstr "Familie"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:128
+#, elixir-autogen, elixir-format
+msgid "Fixed after creation. Members can only switch between types with the same interval."
+msgstr "Nach der Erstellung unveränderlich. Mitglieder können nur zwischen Arten mit demselben Intervall wechseln."
+
+#: lib/mv_web/live/contribution_settings_live.ex:228
+#, elixir-autogen, elixir-format
+msgid "Generated periods"
+msgstr "Generierte Beiträge"
+
+#: lib/mv_web/live/contribution_settings_live.ex:52
+#, elixir-autogen, elixir-format
+msgid "Global Settings"
+msgstr "Globale Einstellungen"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:344
+#: lib/mv_web/live/contribution_settings_live.ex:275
+#: lib/mv_web/live/contribution_type_live/index.ex:203
+#, elixir-autogen, elixir-format
+msgid "Half-yearly"
+msgstr "Halbjährlich"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:181
+#, elixir-autogen, elixir-format
+msgid "Half-yearly contribution for supporting members"
+msgstr "Halbjährlicher Beitrag für Fördermitglieder"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_type_live/index.ex:188
+#, elixir-autogen, elixir-format
+msgid "Honorary"
+msgstr "Ehrenmitglied"
+
+#: lib/mv_web/live/contribution_settings_live.ex:85
+#, elixir-autogen, elixir-format
+msgid "Include joining period"
+msgstr "Zahlt ab Zeitpunkt des Eintritts"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:137
+#: lib/mv_web/live/contribution_type_live/index.ex:57
+#: lib/mv_web/live/contribution_type_live/index.ex:127
+#, elixir-autogen, elixir-format
+msgid "Interval"
+msgstr "Intervall"
+
+#: lib/mv_web/live/contribution_settings_live.ex:220
+#, elixir-autogen, elixir-format
+msgid "Joining date"
+msgstr "Eintrittsdatum"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:332
+#, elixir-autogen, elixir-format
+msgid "Joining year - reduced to 0"
+msgstr "Eintrittsjahr - auf 0 reduziert"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:38
+#, elixir-autogen, elixir-format
+msgid "Manage contribution types for membership fees."
+msgstr "Beitragsarten für Mitgliedsbeiträge verwalten."
+
+#: lib/mv_web/live/contribution_period_live/show.ex:116
+#, elixir-autogen, elixir-format
+msgid "Mark as Paid"
+msgstr "Als bezahlt markieren"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:120
+#, elixir-autogen, elixir-format
+msgid "Mark as Suspended"
+msgstr "Als ausgesetzt markieren"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:124
+#, elixir-autogen, elixir-format
+msgid "Mark as Unpaid"
+msgstr "Als unbezahlt markieren"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:26
+#, elixir-autogen, elixir-format
+msgid "Member Contributions"
+msgstr "Mitgliedsbeiträge"
+
+#: lib/mv_web/live/contribution_settings_live.ex:122
+#, elixir-autogen, elixir-format
+msgid "Member pays for the year they joined"
+msgstr "Mitglied zahlt für das Eintrittsjahr"
+
+#: lib/mv_web/live/contribution_settings_live.ex:155
+#, elixir-autogen, elixir-format
+msgid "Member pays from the joining month"
+msgstr "Mitglied zahlt ab dem Eintrittsmonat"
+
+#: lib/mv_web/live/contribution_settings_live.ex:144
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full quarter"
+msgstr "Mitglied zahlt ab dem nächsten vollen Quartal"
+
+#: lib/mv_web/live/contribution_settings_live.ex:133
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full year"
+msgstr "Mitglied zahlt ab dem nächsten vollen Jahr"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:43
+#, elixir-autogen, elixir-format
+msgid "Member since"
+msgstr "Mitglied seit"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:92
+#, elixir-autogen, elixir-format
+msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
+msgstr "Mitglieder können nur zwischen Beitragsarten mit demselben Zahlungsintervall wechseln (z.B. jährlich zu jährlich). Dies verhindert komplexe Periodenüberschneidungen."
+
+#: lib/mv_web/live/contribution_period_live/show.ex:342
+#: lib/mv_web/live/contribution_settings_live.ex:273
+#: lib/mv_web/live/contribution_type_live/index.ex:201
+#, elixir-autogen, elixir-format
+msgid "Monthly"
+msgstr "Monatlich"
+
+#: lib/mv_web/live/contribution_settings_live.ex:150
+#, elixir-autogen, elixir-format
+msgid "Monthly Interval - Joining Period Included"
+msgstr "Monatliches Intervall - Eintrittsperiode eingeschlossen"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:165
+#, elixir-autogen, elixir-format
+msgid "Monthly fee for students and trainees"
+msgstr "Monatlicher Beitrag für Studierende und Auszubildende"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:123
+#, elixir-autogen, elixir-format
+msgid "Name & Amount"
+msgstr "Name & Betrag"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:42
+#, elixir-autogen, elixir-format
+msgid "New Contribution Type"
+msgstr "Neue Beitragsart"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:189
+#, elixir-autogen, elixir-format
+msgid "No fee for honorary members"
+msgstr "Kein Beitrag für Ehrenmitglieder"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:134
+#, elixir-autogen, elixir-format
+msgid "Only possible if no members are assigned to this type."
+msgstr "Nur möglich, wenn keine Mitglieder dieser Art zugewiesen sind."
+
+#: lib/mv_web/live/contribution_period_live/show.ex:70
+#, elixir-autogen, elixir-format
+msgid "Open Contributions"
+msgstr "Offene Beiträge"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:302
+#, elixir-autogen, elixir-format
+msgid "Paid via bank transfer"
+msgstr "Per Überweisung bezahlt"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:226
+#: lib/mv_web/live/contribution_settings_live.ex:197
+#: lib/mv_web/live/contribution_type_live/index.ex:97
+#, elixir-autogen, elixir-format
+msgid "Preview Mockup"
+msgstr "Vorschau"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:343
+#: lib/mv_web/live/contribution_settings_live.ex:274
+#: lib/mv_web/live/contribution_type_live/index.ex:202
+#, elixir-autogen, elixir-format
+msgid "Quarterly"
+msgstr "Quartalsweise"
+
+#: lib/mv_web/live/contribution_settings_live.ex:139
+#, elixir-autogen, elixir-format
+msgid "Quarterly Interval - Joining Period Excluded"
+msgstr "Quartalsintervall - Eintrittsperiode ausgeschlossen"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:173
+#, elixir-autogen, elixir-format
+msgid "Quarterly fee for family memberships"
+msgstr "Quartalsbeitrag für Familienmitgliedschaften"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_settings_live.ex:250
+#: lib/mv_web/live/contribution_type_live/index.ex:156
+#, elixir-autogen, elixir-format
+msgid "Reduced"
+msgstr "Ermäßigt"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:157
+#, elixir-autogen, elixir-format
+msgid "Reduced fee for unemployed, pensioners, or low income"
+msgstr "Ermäßigter Beitrag für Arbeitslose, Rentner*innen oder Geringverdienende"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:276
+#: lib/mv_web/live/contribution_settings_live.ex:244
+#: lib/mv_web/live/contribution_type_live/index.ex:148
+#, elixir-autogen, elixir-format
+msgid "Regular"
+msgstr "Regulär"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:204
+#, elixir-autogen, elixir-format
+msgid "Reopen"
+msgstr "Wieder öffnen"
+
+#: lib/mv_web/live/contribution_settings_live.ex:176
+#, elixir-autogen, elixir-format
+msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
+msgstr "Sehen Sie, wie die Beitragsperioden für ein einzelnes Mitglied angezeigt werden. Dieses Beispiel zeigt Maria Weber mit mehreren Beitragsperioden."
+
+#: lib/mv_web/live/contribution_type_live/index.ex:149
+#, elixir-autogen, elixir-format
+msgid "Standard membership fee for regular members"
+msgstr "Standard-Mitgliedsbeitrag für reguläre Mitglieder"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:139
+#, elixir-autogen, elixir-format
+msgid "Status"
+msgstr "Status"
+
+#: lib/mv_web/live/contribution_settings_live.ex:256
+#: lib/mv_web/live/contribution_type_live/index.ex:164
+#, elixir-autogen, elixir-format
+msgid "Student"
+msgstr "Student*in"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:180
+#, elixir-autogen, elixir-format
+msgid "Supporting Member"
+msgstr "Fördermitglied"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:195
+#, elixir-autogen, elixir-format
+msgid "Suspend"
+msgstr "Aussetzen"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:260
+#, elixir-autogen, elixir-format
+msgid "Suspended"
+msgstr "Ausgesetzt"
+
+#: lib/mv_web/live/contribution_settings_live.ex:69
+#, elixir-autogen, elixir-format
+msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
+msgstr "Diese Beitragsart wird automatisch allen neuen Mitgliedern zugewiesen. Kann pro Mitglied individuell geändert werden."
+
+#: lib/mv_web/live/contribution_period_live/show.ex:228
+#: lib/mv_web/live/contribution_settings_live.ex:199
+#: lib/mv_web/live/contribution_type_live/index.ex:99
+#, elixir-autogen, elixir-format
+msgid "This page is not functional and only displays the planned features."
+msgstr "Diese Seite ist nicht funktional und zeigt nur die geplanten Funktionen."
+
+#: lib/mv_web/live/contribution_period_live/show.ex:136
+#, elixir-autogen, elixir-format
+msgid "Time Period"
+msgstr "Zeitraum"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:66
+#, elixir-autogen, elixir-format
+msgid "Total Contributions"
+msgstr "Beiträge gesamt"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:251
+#, elixir-autogen, elixir-format
+msgid "Unpaid"
+msgstr "Unbezahlt"
+
+#: lib/mv_web/live/contribution_settings_live.ex:183
+#, elixir-autogen, elixir-format
+msgid "View Example Member"
+msgstr "Beispielmitglied ansehen"
+
+#: lib/mv_web/live/contribution_settings_live.ex:90
+#, elixir-autogen, elixir-format
+msgid "When active: Members pay from the period of their joining."
+msgstr "Wenn aktiv: Mitglieder zahlen ab der Periode ihres Eintritts."
+
+#: lib/mv_web/live/contribution_settings_live.ex:93
+#, elixir-autogen, elixir-format
+msgid "When inactive: Members pay from the next full period after joining."
+msgstr "Wenn inaktiv: Mitglieder zahlen ab der nächsten vollen Periode nach dem Eintritt."
+
+#: lib/mv_web/live/contribution_period_live/show.ex:98
+#, elixir-autogen, elixir-format
+msgid "Why are not all contribution types shown?"
+msgstr "Warum werden nicht alle Beitragsarten angezeigt?"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:85
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_period_live/show.ex:345
+#: lib/mv_web/live/contribution_settings_live.ex:276
+#: lib/mv_web/live/contribution_type_live/index.ex:204
+#, elixir-autogen, elixir-format
+msgid "Yearly"
+msgstr "Jährlich"
+
+#: lib/mv_web/live/contribution_settings_live.ex:128
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Excluded"
+msgstr "Jährliches Intervall - Eintrittsperiode ausgeschlossen"
+
+#: lib/mv_web/live/contribution_settings_live.ex:117
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Included"
+msgstr "Jährliches Intervall - Eintrittsperiode eingeschlossen"
+
 #~ #: lib/mv_web/live/member_live/form.ex:48
 #~ #: lib/mv_web/live/member_live/show.ex:51
 #~ #, elixir-autogen, elixir-format
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 1e0e954..8594746 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -12,6 +12,7 @@ msgid ""
 msgstr ""
 
 #: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/live/contribution_period_live/show.ex:141
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -35,12 +36,14 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
 #: lib/mv_web/live/user_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex:66
 #: lib/mv_web/live/member_live/index.html.heex:242
 #: lib/mv_web/live/user_live/form.ex:265
 #: lib/mv_web/live/user_live/index.html.heex:66
@@ -54,6 +57,7 @@ msgstr ""
 msgid "Edit Member"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:58
 #: lib/mv_web/live/member_live/form.ex:47
 #: lib/mv_web/live/member_live/index.html.heex:112
 #: lib/mv_web/live/member_live/show.ex:50
@@ -122,6 +126,7 @@ msgstr ""
 msgid "House Number"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:140
 #: lib/mv_web/live/member_live/form.ex:52
 #: lib/mv_web/live/member_live/show.ex:57
 #, elixir-autogen, elixir-format
@@ -130,6 +135,8 @@ msgstr ""
 
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
+#: lib/mv_web/live/contribution_period_live/show.ex:186
+#: lib/mv_web/live/contribution_period_live/show.ex:242
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/show.ex:51
@@ -289,7 +296,7 @@ msgstr ""
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:102
+#: lib/mv_web/components/layouts/navbar.ex:113
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
@@ -306,12 +313,14 @@ msgid "Member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:25
+#: lib/mv_web/live/contribution_type_live/index.ex:61
 #: lib/mv_web/live/member_live/index.ex:73
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex:48
 #: lib/mv_web/live/custom_field_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -332,6 +341,7 @@ msgstr ""
 msgid "Not set"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:207
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -350,7 +360,7 @@ msgstr ""
 msgid "Password Authentication"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:95
+#: lib/mv_web/components/layouts/navbar.ex:106
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
@@ -370,7 +380,7 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/components/layouts/navbar.ex:110
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -538,14 +548,14 @@ msgstr ""
 msgid "Back to users list"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:33
-#: lib/mv_web/components/layouts/navbar.ex:39
+#: lib/mv_web/components/layouts/navbar.ex:44
+#: lib/mv_web/components/layouts/navbar.ex:50
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:46
-#: lib/mv_web/components/layouts/navbar.ex:66
+#: lib/mv_web/components/layouts/navbar.ex:57
+#: lib/mv_web/components/layouts/navbar.ex:77
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr ""
@@ -717,6 +727,7 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 
+#: lib/mv_web/live/contribution_settings_live.ex:102
 #: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format
 msgid "Save Settings"
@@ -853,3 +864,429 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Payment filter"
 msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:107
+#, elixir-autogen, elixir-format
+msgid "%{count} period selected"
+msgid_plural "%{count} periods selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:113
+#, elixir-autogen, elixir-format
+msgid "About Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:138
+#: lib/mv_web/live/contribution_type_live/index.ex:53
+#, elixir-autogen, elixir-format
+msgid "Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:48
+#, elixir-autogen, elixir-format
+msgid "Back to Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:124
+#, elixir-autogen, elixir-format
+msgid "Can be changed at any time. Amount changes affect future periods only."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:77
+#, elixir-autogen, elixir-format
+msgid "Cannot delete - members assigned"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:83
+#, elixir-autogen, elixir-format
+msgid "Change Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:42
+#, elixir-autogen, elixir-format
+msgid "Configure global settings for membership contributions."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:34
+#: lib/mv_web/live/contribution_settings_live.ex:27
+#: lib/mv_web/live/contribution_settings_live.ex:40
+#, elixir-autogen, elixir-format
+msgid "Contribution Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:62
+#, elixir-autogen, elixir-format
+msgid "Contribution Start"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:32
+#: lib/mv_web/live/contribution_type_live/index.ex:25
+#: lib/mv_web/live/contribution_type_live/index.ex:36
+#, elixir-autogen, elixir-format
+msgid "Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:224
+#, elixir-autogen, elixir-format
+msgid "Contribution start"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:41
+#, elixir-autogen, elixir-format
+msgid "Contribution type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:117
+#, elixir-autogen, elixir-format
+msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:30
+#, elixir-autogen, elixir-format
+msgid "Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:39
+#, elixir-autogen, elixir-format
+msgid "Contributions for %{name}"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:159
+#, elixir-autogen, elixir-format
+msgid "Current"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:60
+#, elixir-autogen, elixir-format
+msgid "Default Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:133
+#, elixir-autogen, elixir-format
+msgid "Deletion"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:173
+#, elixir-autogen, elixir-format
+msgid "Example: Member Contribution View"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:113
+#, elixir-autogen, elixir-format
+msgid "Examples"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:262
+#: lib/mv_web/live/contribution_type_live/index.ex:172
+#, elixir-autogen, elixir-format
+msgid "Family"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:128
+#, elixir-autogen, elixir-format
+msgid "Fixed after creation. Members can only switch between types with the same interval."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:228
+#, elixir-autogen, elixir-format
+msgid "Generated periods"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:52
+#, elixir-autogen, elixir-format
+msgid "Global Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:344
+#: lib/mv_web/live/contribution_settings_live.ex:275
+#: lib/mv_web/live/contribution_type_live/index.ex:203
+#, elixir-autogen, elixir-format
+msgid "Half-yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:181
+#, elixir-autogen, elixir-format
+msgid "Half-yearly contribution for supporting members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_type_live/index.ex:188
+#, elixir-autogen, elixir-format
+msgid "Honorary"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:85
+#, elixir-autogen, elixir-format
+msgid "Include joining period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:137
+#: lib/mv_web/live/contribution_type_live/index.ex:57
+#: lib/mv_web/live/contribution_type_live/index.ex:127
+#, elixir-autogen, elixir-format
+msgid "Interval"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:220
+#, elixir-autogen, elixir-format
+msgid "Joining date"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:332
+#, elixir-autogen, elixir-format
+msgid "Joining year - reduced to 0"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:38
+#, elixir-autogen, elixir-format
+msgid "Manage contribution types for membership fees."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:116
+#, elixir-autogen, elixir-format
+msgid "Mark as Paid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:120
+#, elixir-autogen, elixir-format
+msgid "Mark as Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:124
+#, elixir-autogen, elixir-format
+msgid "Mark as Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:26
+#, elixir-autogen, elixir-format
+msgid "Member Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:122
+#, elixir-autogen, elixir-format
+msgid "Member pays for the year they joined"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:155
+#, elixir-autogen, elixir-format
+msgid "Member pays from the joining month"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:144
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full quarter"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:133
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full year"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:43
+#, elixir-autogen, elixir-format
+msgid "Member since"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:92
+#, elixir-autogen, elixir-format
+msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:342
+#: lib/mv_web/live/contribution_settings_live.ex:273
+#: lib/mv_web/live/contribution_type_live/index.ex:201
+#, elixir-autogen, elixir-format
+msgid "Monthly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:150
+#, elixir-autogen, elixir-format
+msgid "Monthly Interval - Joining Period Included"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:165
+#, elixir-autogen, elixir-format
+msgid "Monthly fee for students and trainees"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:123
+#, elixir-autogen, elixir-format
+msgid "Name & Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:42
+#, elixir-autogen, elixir-format
+msgid "New Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:189
+#, elixir-autogen, elixir-format
+msgid "No fee for honorary members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:134
+#, elixir-autogen, elixir-format
+msgid "Only possible if no members are assigned to this type."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:70
+#, elixir-autogen, elixir-format
+msgid "Open Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:302
+#, elixir-autogen, elixir-format
+msgid "Paid via bank transfer"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:226
+#: lib/mv_web/live/contribution_settings_live.ex:197
+#: lib/mv_web/live/contribution_type_live/index.ex:97
+#, elixir-autogen, elixir-format
+msgid "Preview Mockup"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:343
+#: lib/mv_web/live/contribution_settings_live.ex:274
+#: lib/mv_web/live/contribution_type_live/index.ex:202
+#, elixir-autogen, elixir-format
+msgid "Quarterly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:139
+#, elixir-autogen, elixir-format
+msgid "Quarterly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:173
+#, elixir-autogen, elixir-format
+msgid "Quarterly fee for family memberships"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_settings_live.ex:250
+#: lib/mv_web/live/contribution_type_live/index.ex:156
+#, elixir-autogen, elixir-format
+msgid "Reduced"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:157
+#, elixir-autogen, elixir-format
+msgid "Reduced fee for unemployed, pensioners, or low income"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:276
+#: lib/mv_web/live/contribution_settings_live.ex:244
+#: lib/mv_web/live/contribution_type_live/index.ex:148
+#, elixir-autogen, elixir-format
+msgid "Regular"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:204
+#, elixir-autogen, elixir-format
+msgid "Reopen"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:176
+#, elixir-autogen, elixir-format
+msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:149
+#, elixir-autogen, elixir-format
+msgid "Standard membership fee for regular members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:139
+#, elixir-autogen, elixir-format
+msgid "Status"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:256
+#: lib/mv_web/live/contribution_type_live/index.ex:164
+#, elixir-autogen, elixir-format
+msgid "Student"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:180
+#, elixir-autogen, elixir-format
+msgid "Supporting Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:195
+#, elixir-autogen, elixir-format
+msgid "Suspend"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:260
+#, elixir-autogen, elixir-format
+msgid "Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:69
+#, elixir-autogen, elixir-format
+msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:228
+#: lib/mv_web/live/contribution_settings_live.ex:199
+#: lib/mv_web/live/contribution_type_live/index.ex:99
+#, elixir-autogen, elixir-format
+msgid "This page is not functional and only displays the planned features."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:136
+#, elixir-autogen, elixir-format
+msgid "Time Period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:66
+#, elixir-autogen, elixir-format
+msgid "Total Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:251
+#, elixir-autogen, elixir-format
+msgid "Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:183
+#, elixir-autogen, elixir-format
+msgid "View Example Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:90
+#, elixir-autogen, elixir-format
+msgid "When active: Members pay from the period of their joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:93
+#, elixir-autogen, elixir-format
+msgid "When inactive: Members pay from the next full period after joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:98
+#, elixir-autogen, elixir-format
+msgid "Why are not all contribution types shown?"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:85
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_period_live/show.ex:345
+#: lib/mv_web/live/contribution_settings_live.ex:276
+#: lib/mv_web/live/contribution_type_live/index.ex:204
+#, elixir-autogen, elixir-format
+msgid "Yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:128
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:117
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Included"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 319bcc3..cf081bf 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -12,6 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/live/contribution_period_live/show.ex:141
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -35,12 +36,14 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
 #: lib/mv_web/live/user_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex:66
 #: lib/mv_web/live/member_live/index.html.heex:242
 #: lib/mv_web/live/user_live/form.ex:265
 #: lib/mv_web/live/user_live/index.html.heex:66
@@ -54,6 +57,7 @@ msgstr ""
 msgid "Edit Member"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:58
 #: lib/mv_web/live/member_live/form.ex:47
 #: lib/mv_web/live/member_live/index.html.heex:112
 #: lib/mv_web/live/member_live/show.ex:50
@@ -122,6 +126,7 @@ msgstr ""
 msgid "House Number"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:140
 #: lib/mv_web/live/member_live/form.ex:52
 #: lib/mv_web/live/member_live/show.ex:57
 #, elixir-autogen, elixir-format
@@ -130,6 +135,8 @@ msgstr ""
 
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
+#: lib/mv_web/live/contribution_period_live/show.ex:186
+#: lib/mv_web/live/contribution_period_live/show.ex:242
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/show.ex:51
@@ -289,7 +296,7 @@ msgstr ""
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:102
+#: lib/mv_web/components/layouts/navbar.ex:113
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
@@ -306,12 +313,14 @@ msgid "Member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:25
+#: lib/mv_web/live/contribution_type_live/index.ex:61
 #: lib/mv_web/live/member_live/index.ex:73
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex:48
 #: lib/mv_web/live/custom_field_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -332,6 +341,7 @@ msgstr ""
 msgid "Not set"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:207
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -350,7 +360,7 @@ msgstr ""
 msgid "Password Authentication"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:95
+#: lib/mv_web/components/layouts/navbar.ex:106
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
@@ -370,7 +380,7 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/components/layouts/navbar.ex:110
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -538,14 +548,14 @@ msgstr ""
 msgid "Back to users list"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:33
-#: lib/mv_web/components/layouts/navbar.ex:39
+#: lib/mv_web/components/layouts/navbar.ex:44
+#: lib/mv_web/components/layouts/navbar.ex:50
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Select language"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:46
-#: lib/mv_web/components/layouts/navbar.ex:66
+#: lib/mv_web/components/layouts/navbar.ex:57
+#: lib/mv_web/components/layouts/navbar.ex:77
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr ""
@@ -717,6 +727,7 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 
+#: lib/mv_web/live/contribution_settings_live.ex:102
 #: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
@@ -854,8 +865,440 @@ msgstr ""
 msgid "Payment filter"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:107
+#, elixir-autogen, elixir-format
+msgid "%{count} period selected"
+msgid_plural "%{count} periods selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:113
+#, elixir-autogen, elixir-format
+msgid "About Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:138
+#: lib/mv_web/live/contribution_type_live/index.ex:53
+#, elixir-autogen, elixir-format
+msgid "Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:48
+#, elixir-autogen, elixir-format
+msgid "Back to Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:124
+#, elixir-autogen, elixir-format
+msgid "Can be changed at any time. Amount changes affect future periods only."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:77
+#, elixir-autogen, elixir-format
+msgid "Cannot delete - members assigned"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:83
+#, elixir-autogen, elixir-format
+msgid "Change Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:42
+#, elixir-autogen, elixir-format
+msgid "Configure global settings for membership contributions."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:34
+#: lib/mv_web/live/contribution_settings_live.ex:27
+#: lib/mv_web/live/contribution_settings_live.ex:40
+#, elixir-autogen, elixir-format
+msgid "Contribution Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:62
+#, elixir-autogen, elixir-format
+msgid "Contribution Start"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:32
+#: lib/mv_web/live/contribution_type_live/index.ex:25
+#: lib/mv_web/live/contribution_type_live/index.ex:36
+#, elixir-autogen, elixir-format
+msgid "Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:224
+#, elixir-autogen, elixir-format
+msgid "Contribution start"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:41
+#, elixir-autogen, elixir-format
+msgid "Contribution type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:117
+#, elixir-autogen, elixir-format
+msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:30
+#, elixir-autogen, elixir-format
+msgid "Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:39
+#, elixir-autogen, elixir-format
+msgid "Contributions for %{name}"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:159
+#, elixir-autogen, elixir-format
+msgid "Current"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:60
+#, elixir-autogen, elixir-format
+msgid "Default Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:133
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Deletion"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:173
+#, elixir-autogen, elixir-format
+msgid "Example: Member Contribution View"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:113
+#, elixir-autogen, elixir-format
+msgid "Examples"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:262
+#: lib/mv_web/live/contribution_type_live/index.ex:172
+#, elixir-autogen, elixir-format
+msgid "Family"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:128
+#, elixir-autogen, elixir-format
+msgid "Fixed after creation. Members can only switch between types with the same interval."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:228
+#, elixir-autogen, elixir-format
+msgid "Generated periods"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:52
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Global Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:344
+#: lib/mv_web/live/contribution_settings_live.ex:275
+#: lib/mv_web/live/contribution_type_live/index.ex:203
+#, elixir-autogen, elixir-format
+msgid "Half-yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:181
+#, elixir-autogen, elixir-format
+msgid "Half-yearly contribution for supporting members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_type_live/index.ex:188
+#, elixir-autogen, elixir-format
+msgid "Honorary"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:85
+#, elixir-autogen, elixir-format
+msgid "Include joining period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:137
+#: lib/mv_web/live/contribution_type_live/index.ex:57
+#: lib/mv_web/live/contribution_type_live/index.ex:127
+#, elixir-autogen, elixir-format
+msgid "Interval"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:220
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Joining date"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:332
+#, elixir-autogen, elixir-format
+msgid "Joining year - reduced to 0"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:38
+#, elixir-autogen, elixir-format
+msgid "Manage contribution types for membership fees."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:116
+#, elixir-autogen, elixir-format
+msgid "Mark as Paid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:120
+#, elixir-autogen, elixir-format
+msgid "Mark as Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:124
+#, elixir-autogen, elixir-format
+msgid "Mark as Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:26
+#, elixir-autogen, elixir-format
+msgid "Member Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:122
+#, elixir-autogen, elixir-format
+msgid "Member pays for the year they joined"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:155
+#, elixir-autogen, elixir-format
+msgid "Member pays from the joining month"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:144
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full quarter"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:133
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full year"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:43
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Member since"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:92
+#, elixir-autogen, elixir-format
+msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:342
+#: lib/mv_web/live/contribution_settings_live.ex:273
+#: lib/mv_web/live/contribution_type_live/index.ex:201
+#, elixir-autogen, elixir-format
+msgid "Monthly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:150
+#, elixir-autogen, elixir-format
+msgid "Monthly Interval - Joining Period Included"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:165
+#, elixir-autogen, elixir-format
+msgid "Monthly fee for students and trainees"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:123
+#, elixir-autogen, elixir-format
+msgid "Name & Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:42
+#, elixir-autogen, elixir-format
+msgid "New Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:189
+#, elixir-autogen, elixir-format
+msgid "No fee for honorary members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:134
+#, elixir-autogen, elixir-format
+msgid "Only possible if no members are assigned to this type."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:70
+#, elixir-autogen, elixir-format
+msgid "Open Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:302
+#, elixir-autogen, elixir-format
+msgid "Paid via bank transfer"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:226
+#: lib/mv_web/live/contribution_settings_live.ex:197
+#: lib/mv_web/live/contribution_type_live/index.ex:97
+#, elixir-autogen, elixir-format
+msgid "Preview Mockup"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:343
+#: lib/mv_web/live/contribution_settings_live.ex:274
+#: lib/mv_web/live/contribution_type_live/index.ex:202
+#, elixir-autogen, elixir-format
+msgid "Quarterly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:139
+#, elixir-autogen, elixir-format
+msgid "Quarterly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:173
+#, elixir-autogen, elixir-format
+msgid "Quarterly fee for family memberships"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_settings_live.ex:250
+#: lib/mv_web/live/contribution_type_live/index.ex:156
+#, elixir-autogen, elixir-format
+msgid "Reduced"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:157
+#, elixir-autogen, elixir-format
+msgid "Reduced fee for unemployed, pensioners, or low income"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:276
+#: lib/mv_web/live/contribution_settings_live.ex:244
+#: lib/mv_web/live/contribution_type_live/index.ex:148
+#, elixir-autogen, elixir-format
+msgid "Regular"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:204
+#, elixir-autogen, elixir-format
+msgid "Reopen"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:176
+#, elixir-autogen, elixir-format
+msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:149
+#, elixir-autogen, elixir-format
+msgid "Standard membership fee for regular members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:139
+#, elixir-autogen, elixir-format
+msgid "Status"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:256
+#: lib/mv_web/live/contribution_type_live/index.ex:164
+#, elixir-autogen, elixir-format
+msgid "Student"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:180
+#, elixir-autogen, elixir-format
+msgid "Supporting Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:195
+#, elixir-autogen, elixir-format
+msgid "Suspend"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:260
+#, elixir-autogen, elixir-format
+msgid "Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:69
+#, elixir-autogen, elixir-format
+msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:228
+#: lib/mv_web/live/contribution_settings_live.ex:199
+#: lib/mv_web/live/contribution_type_live/index.ex:99
+#, elixir-autogen, elixir-format
+msgid "This page is not functional and only displays the planned features."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:136
+#, elixir-autogen, elixir-format
+msgid "Time Period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:66
+#, elixir-autogen, elixir-format
+msgid "Total Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:251
+#, elixir-autogen, elixir-format
+msgid "Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:183
+#, elixir-autogen, elixir-format
+msgid "View Example Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:90
+#, elixir-autogen, elixir-format
+msgid "When active: Members pay from the period of their joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:93
+#, elixir-autogen, elixir-format
+msgid "When inactive: Members pay from the next full period after joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:98
+#, elixir-autogen, elixir-format
+msgid "Why are not all contribution types shown?"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:85
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_period_live/show.ex:345
+#: lib/mv_web/live/contribution_settings_live.ex:276
+#: lib/mv_web/live/contribution_type_live/index.ex:204
+#, elixir-autogen, elixir-format
+msgid "Yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:128
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:117
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Included"
+msgstr ""
+
 #~ #: lib/mv_web/live/member_live/form.ex:48
 #~ #: lib/mv_web/live/member_live/show.ex:51
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Birth Date"
 #~ msgstr ""
+
+#~ #: lib/mv_web/live/contribution_period_live/show.ex:273
+#~ #: lib/mv_web/live/contribution_settings_live.ex:248
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Related Pages"
+#~ msgstr ""

From 4057b2d631884be83d2405f5b38d39b16383d56b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= <hello@rafa.ee>
Date: Wed, 3 Dec 2025 14:06:24 +0100
Subject: [PATCH 04/12] Extend gettext conflict script to other conflict marker
 styles

---
 Justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Justfile b/Justfile
index 876591d..25fb35c 100644
--- a/Justfile
+++ b/Justfile
@@ -90,7 +90,7 @@ clean:
 remove-gettext-conflicts:
   #!/usr/bin/env bash
   set -euo pipefail
-  find priv/gettext -type f -exec sed -i '/^<<<<<<< HEAD$/d; /^=======$/d; /^>>>>>>>/d' {} \;
+  find priv/gettext -type f -exec sed -i '/^<<<<<<</d; /^=======$/d; /^>>>>>>>/d; /^%%%%%%%/d; /^++++++/d; s/^+//' {} \;
 
 # Production environment commands
 # ================================

From dfff2486b55b68ac418987725dc1cac08eaac7ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= <hello@rafa.ee>
Date: Wed, 3 Dec 2025 10:41:40 +0100
Subject: [PATCH 05/12] Fix postgres errors when running tests

---
 config/test.exs                        |   3 +
 lib/mv_web/endpoint.ex                 |   5 +
 priv/gettext/de/LC_MESSAGES/default.po | 160 ++++++++++++-------------
 priv/gettext/default.pot               | 144 ++++++++++------------
 priv/gettext/en/LC_MESSAGES/default.po | 160 ++++++++++++-------------
 test/support/conn_case.ex              |  10 +-
 test/support/data_case.ex              |   2 +
 7 files changed, 242 insertions(+), 242 deletions(-)

diff --git a/config/test.exs b/config/test.exs
index bcb55eb..2c4d2ba 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -45,3 +45,6 @@ config :mv, :token_signing_secret, "test_secret_key_for_ash_authentication_token
 config :mv, :session_identifier, :unsafe
 
 config :mv, :require_token_presence_for_authentication, false
+
+# Enable SQL Sandbox for async LiveView tests
+config :mv, :sql_sandbox, true
diff --git a/lib/mv_web/endpoint.ex b/lib/mv_web/endpoint.ex
index 97dcae4..d1b4247 100644
--- a/lib/mv_web/endpoint.ex
+++ b/lib/mv_web/endpoint.ex
@@ -39,6 +39,11 @@ defmodule MvWeb.Endpoint do
     plug Phoenix.Ecto.CheckRepoStatus, otp_app: :mv
   end
 
+  # Enable Ecto SQL Sandbox in test environment for async tests
+  if Application.compile_env(:mv, :sql_sandbox) do
+    plug Phoenix.Ecto.SQL.Sandbox
+  end
+
   plug Phoenix.LiveDashboard.RequestLogger,
     param_key: "request_logger",
     cookie_key: "request_logger"
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index be7ffef..607ad9e 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex:387
 #: lib/mv_web/live/contribution_period_live/show.ex:141
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr "Aktionen"
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/user_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr "Bist du sicher?"
@@ -30,28 +30,28 @@ msgstr "Verbindung wird wiederhergestellt"
 
 #: lib/mv_web/live/member_live/form.ex:53
 #: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/show.ex:59
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr "Stadt"
 
 #: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/user_live/index.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr "Löschen"
 
 #: lib/mv_web/live/contribution_type_live/index.ex:66
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/user_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: lib/mv_web/live/member_live/show.ex:41
-#: lib/mv_web/live/member_live/show.ex:116
+#: lib/mv_web/live/member_live/show.ex:42
+#: lib/mv_web/live/member_live/show.ex:114
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr "Mitglied bearbeiten"
@@ -59,29 +59,29 @@ msgstr "Mitglied bearbeiten"
 #: lib/mv_web/live/contribution_period_live/show.ex:58
 #: lib/mv_web/live/member_live/form.ex:47
 #: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/show.ex:51
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr "E-Mail"
 
 #: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:48
+#: lib/mv_web/live/member_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr "Vorname"
 
 #: lib/mv_web/live/member_live/form.ex:50
 #: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr "Beitrittsdatum"
 
 #: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr "Nachname"
@@ -92,7 +92,7 @@ msgid "New Member"
 msgstr "Neues Mitglied"
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/user_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr "Anzeigen"
@@ -113,21 +113,21 @@ msgid "close"
 msgstr "schließen"
 
 #: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/show.ex:57
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr "Austrittsdatum"
 
 #: lib/mv_web/live/member_live/form.ex:55
 #: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:60
+#: lib/mv_web/live/member_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr "Hausnummer"
 
 #: lib/mv_web/live/contribution_period_live/show.ex:140
 #: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/show.ex:58
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Notizen"
@@ -135,24 +135,24 @@ msgstr "Notizen"
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
 #: lib/mv_web/live/contribution_period_live/show.ex:186
-#: lib/mv_web/live/contribution_period_live/show.ex:242
+#: lib/mv_web/live/contribution_period_live/show.ex:241
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/member_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr "Bezahlt"
 
 #: lib/mv_web/live/member_live/form.ex:49
 #: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:54
+#: lib/mv_web/live/member_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #: lib/mv_web/live/member_live/form.ex:56
 #: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:61
+#: lib/mv_web/live/member_live/show.ex:62
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr "Postleitzahl"
@@ -166,43 +166,43 @@ msgstr "Mitglied speichern"
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
 #: lib/mv_web/live/global_settings_live.ex:55
 #: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Speichern..."
 
 #: lib/mv_web/live/member_live/form.ex:54
 #: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:59
+#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr "Straße"
 
-#: lib/mv_web/live/member_live/show.ex:47
+#: lib/mv_web/live/member_live/show.ex:48
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr "ID"
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:62
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr "Nein"
 
-#: lib/mv_web/live/member_live/show.ex:115
+#: lib/mv_web/live/member_live/show.ex:113
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr "Mitglied anzeigen"
 
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "This is a member record from your database."
 msgstr "Dies ist ein Mitglied aus deiner Datenbank."
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr "Ja"
@@ -260,7 +260,7 @@ msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt"
 #: lib/mv_web/live/custom_field_live/index.ex:120
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/user_live/form.ex:252
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -280,16 +280,11 @@ msgstr "Beschreibung"
 msgid "Edit User"
 msgstr "Benutzer*in bearbeiten"
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr "ID"
-
 #: lib/mv_web/live/custom_field_live/form.ex:62
 #, elixir-autogen, elixir-format
 msgid "Immutable"
@@ -313,7 +308,7 @@ msgstr "Mitglied"
 
 #: lib/mv_web/components/layouts/navbar.ex:25
 #: lib/mv_web/live/contribution_type_live/index.ex:61
-#: lib/mv_web/live/member_live/index.ex:73
+#: lib/mv_web/live/member_live/index.ex:74
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
@@ -330,16 +325,11 @@ msgstr "Name"
 msgid "New User"
 msgstr "Neue*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr "Nicht aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "Not set"
-msgstr "Nicht gesetzt"
-
 #: lib/mv_web/live/contribution_period_live/show.ex:207
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
@@ -348,13 +338,7 @@ msgstr "Nicht gesetzt"
 msgid "Note"
 msgstr "Hinweis"
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr "OIDC ID"
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr "Passwort-Authentifizierung"
@@ -384,12 +368,12 @@ msgstr "Mitglied auswählen"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex:250
 #, elixir-autogen, elixir-format
 msgid "Save User"
 msgstr "Benutzer*in speichern"
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr "Benutzer*in anzeigen"
@@ -409,7 +393,7 @@ msgstr "Nicht unterstützter Wertetyp: %{type}"
 msgid "Use this form to manage user records in your database."
 msgstr "Verwenden Sie dieses Formular, um Benutzer*innen-Datensätze zu verwalten."
 
-#: lib/mv_web/live/user_live/form.ex:266
+#: lib/mv_web/live/user_live/form.ex:268
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -437,7 +421,7 @@ msgstr "aufsteigend"
 msgid "descending"
 msgstr "absteigend"
 
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex:267
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr "Neue*r"
@@ -513,30 +497,30 @@ msgid "User will be created without a password. Check 'Set Password' to add one.
 msgstr "Benutzer*in wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen."
 
 #: lib/mv_web/live/user_live/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr "Verknüpftes Mitglied"
 
-#: lib/mv_web/live/member_live/show.ex:62
+#: lib/mv_web/live/member_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr "Verknüpfte*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex:56
+#: lib/mv_web/live/user_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr "Kein Mitglied verknüpft"
 
-#: lib/mv_web/live/member_live/show.ex:72
+#: lib/mv_web/live/member_live/show.ex:73
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr "Keine*r Benutzer*in verknüpft"
 
-#: lib/mv_web/live/member_live/show.ex:36
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex:37
+#: lib/mv_web/live/member_live/show.ex:39
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr "Zurück zur Mitgliederliste"
@@ -618,7 +602,7 @@ msgid "Choose a custom field"
 msgstr "Wähle ein Benutzerdefiniertes Feld"
 
 #: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:77
+#: lib/mv_web/live/member_live/show.ex:78
 #, elixir-autogen, elixir-format
 msgid "Custom Field Values"
 msgstr "Benutzerdefinierte Feldwerte"
@@ -747,7 +731,7 @@ msgstr "Ein Mitglied mit dieser E-Mail-Adresse existiert bereits. Um mit einem a
 msgid "Available members"
 msgstr "Verfügbare Mitglieder"
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex:359
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr "Fehler beim Verlinken des Mitglieds: %{error}"
@@ -787,7 +771,7 @@ msgstr "Mitglied entverknüpfen"
 msgid "Unlinking scheduled"
 msgstr "Entverknüpfung geplant"
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex:160
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -804,12 +788,12 @@ msgstr "E-Mail-Adressen der ausgewählten Mitglieder kopieren"
 msgid "Copy emails"
 msgstr "E-Mails kopieren"
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex:149
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr "Keine E-Mail-Adressen gefunden"
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex:146
 #, elixir-autogen, elixir-format
 msgid "No members selected"
 msgstr "Keine Mitglieder ausgewählt"
@@ -824,7 +808,7 @@ msgstr "E-Mail-Programm mit BCC-Empfänger*innen öffnen"
 msgid "Open in email program"
 msgstr "Im E-Mail-Programm öffnen"
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex:169
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr "Tipp: E-Mail-Adressen ins BCC-Feld einfügen für Datenschutzkonformität"
@@ -997,7 +981,7 @@ msgstr "Generierte Beiträge"
 msgid "Global Settings"
 msgstr "Globale Einstellungen"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:344
+#: lib/mv_web/live/contribution_period_live/show.ex:343
 #: lib/mv_web/live/contribution_settings_live.ex:275
 #: lib/mv_web/live/contribution_type_live/index.ex:203
 #, elixir-autogen, elixir-format
@@ -1032,7 +1016,7 @@ msgstr "Intervall"
 msgid "Joining date"
 msgstr "Eintrittsdatum"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:332
+#: lib/mv_web/live/contribution_period_live/show.ex:331
 #, elixir-autogen, elixir-format
 msgid "Joining year - reduced to 0"
 msgstr "Eintrittsjahr - auf 0 reduziert"
@@ -1092,7 +1076,7 @@ msgstr "Mitglied seit"
 msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
 msgstr "Mitglieder können nur zwischen Beitragsarten mit demselben Zahlungsintervall wechseln (z.B. jährlich zu jährlich). Dies verhindert komplexe Periodenüberschneidungen."
 
-#: lib/mv_web/live/contribution_period_live/show.ex:342
+#: lib/mv_web/live/contribution_period_live/show.ex:341
 #: lib/mv_web/live/contribution_settings_live.ex:273
 #: lib/mv_web/live/contribution_type_live/index.ex:201
 #, elixir-autogen, elixir-format
@@ -1134,19 +1118,19 @@ msgstr "Nur möglich, wenn keine Mitglieder dieser Art zugewiesen sind."
 msgid "Open Contributions"
 msgstr "Offene Beiträge"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:302
+#: lib/mv_web/live/contribution_period_live/show.ex:301
 #, elixir-autogen, elixir-format
 msgid "Paid via bank transfer"
 msgstr "Per Überweisung bezahlt"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:226
+#: lib/mv_web/live/contribution_period_live/show.ex:225
 #: lib/mv_web/live/contribution_settings_live.ex:197
 #: lib/mv_web/live/contribution_type_live/index.ex:97
 #, elixir-autogen, elixir-format
 msgid "Preview Mockup"
 msgstr "Vorschau"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:343
+#: lib/mv_web/live/contribution_period_live/show.ex:342
 #: lib/mv_web/live/contribution_settings_live.ex:274
 #: lib/mv_web/live/contribution_type_live/index.ex:202
 #, elixir-autogen, elixir-format
@@ -1175,7 +1159,7 @@ msgstr "Ermäßigt"
 msgid "Reduced fee for unemployed, pensioners, or low income"
 msgstr "Ermäßigter Beitrag für Arbeitslose, Rentner*innen oder Geringverdienende"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:276
+#: lib/mv_web/live/contribution_period_live/show.ex:275
 #: lib/mv_web/live/contribution_settings_live.ex:244
 #: lib/mv_web/live/contribution_type_live/index.ex:148
 #, elixir-autogen, elixir-format
@@ -1218,7 +1202,7 @@ msgstr "Fördermitglied"
 msgid "Suspend"
 msgstr "Aussetzen"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:260
+#: lib/mv_web/live/contribution_period_live/show.ex:259
 #, elixir-autogen, elixir-format
 msgid "Suspended"
 msgstr "Ausgesetzt"
@@ -1228,7 +1212,7 @@ msgstr "Ausgesetzt"
 msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
 msgstr "Diese Beitragsart wird automatisch allen neuen Mitgliedern zugewiesen. Kann pro Mitglied individuell geändert werden."
 
-#: lib/mv_web/live/contribution_period_live/show.ex:228
+#: lib/mv_web/live/contribution_period_live/show.ex:227
 #: lib/mv_web/live/contribution_settings_live.ex:199
 #: lib/mv_web/live/contribution_type_live/index.ex:99
 #, elixir-autogen, elixir-format
@@ -1245,7 +1229,7 @@ msgstr "Zeitraum"
 msgid "Total Contributions"
 msgstr "Beiträge gesamt"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:251
+#: lib/mv_web/live/contribution_period_live/show.ex:250
 #, elixir-autogen, elixir-format
 msgid "Unpaid"
 msgstr "Unbezahlt"
@@ -1273,7 +1257,7 @@ msgstr "Warum werden nicht alle Beitragsarten angezeigt?"
 #: lib/mv_web/live/contribution_period_live/show.ex:85
 #: lib/mv_web/live/contribution_period_live/show.ex:86
 #: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_period_live/show.ex:345
+#: lib/mv_web/live/contribution_period_live/show.ex:344
 #: lib/mv_web/live/contribution_settings_live.ex:276
 #: lib/mv_web/live/contribution_type_live/index.ex:204
 #, elixir-autogen, elixir-format
@@ -1295,3 +1279,19 @@ msgstr "Jährliches Intervall - Eintrittsperiode eingeschlossen"
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Birth Date"
 #~ msgstr "Geburtsdatum"
+
+#~ #: lib/mv_web/live/user_live/show.ex:49
+#~ #, elixir-autogen, elixir-format
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Not set"
+#~ msgstr "Nicht gesetzt"
+
+#~ #: lib/mv_web/live/user_live/index.html.heex:52
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format
+#~ msgid "OIDC ID"
+#~ msgstr "OIDC ID"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 8594746..b66c5ed 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -11,14 +11,14 @@
 msgid ""
 msgstr ""
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex:387
 #: lib/mv_web/live/contribution_period_live/show.ex:141
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/user_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
@@ -31,28 +31,28 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:53
 #: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/show.ex:59
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
 
 #: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/user_live/index.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
 #: lib/mv_web/live/contribution_type_live/index.ex:66
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/user_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:41
-#: lib/mv_web/live/member_live/show.ex:116
+#: lib/mv_web/live/member_live/show.ex:42
+#: lib/mv_web/live/member_live/show.ex:114
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
@@ -60,29 +60,29 @@ msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex:58
 #: lib/mv_web/live/member_live/form.ex:47
 #: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/show.ex:51
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:48
+#: lib/mv_web/live/member_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:50
 #: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
@@ -93,7 +93,7 @@ msgid "New Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/user_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
@@ -114,21 +114,21 @@ msgid "close"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/show.ex:57
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:55
 #: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:60
+#: lib/mv_web/live/member_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
 #: lib/mv_web/live/contribution_period_live/show.ex:140
 #: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/show.ex:58
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
@@ -136,24 +136,24 @@ msgstr ""
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
 #: lib/mv_web/live/contribution_period_live/show.ex:186
-#: lib/mv_web/live/contribution_period_live/show.ex:242
+#: lib/mv_web/live/contribution_period_live/show.ex:241
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/member_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:49
 #: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:54
+#: lib/mv_web/live/member_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:56
 #: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:61
+#: lib/mv_web/live/member_live/show.ex:62
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
@@ -167,43 +167,43 @@ msgstr ""
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
 #: lib/mv_web/live/global_settings_live.ex:55
 #: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:54
 #: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:59
+#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:47
+#: lib/mv_web/live/member_live/show.ex:48
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:62
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:115
+#: lib/mv_web/live/member_live/show.ex:113
 #, elixir-autogen, elixir-format
 msgid "Show Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "This is a member record from your database."
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
@@ -261,7 +261,7 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/index.ex:120
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/user_live/form.ex:252
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
@@ -281,16 +281,11 @@ msgstr ""
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_live/form.ex:62
 #, elixir-autogen, elixir-format
 msgid "Immutable"
@@ -314,7 +309,7 @@ msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:25
 #: lib/mv_web/live/contribution_type_live/index.ex:61
-#: lib/mv_web/live/member_live/index.ex:73
+#: lib/mv_web/live/member_live/index.ex:74
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
@@ -331,14 +326,9 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
-#, elixir-autogen, elixir-format
-msgid "Not enabled"
-msgstr ""
-
 #: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
-msgid "Not set"
+msgid "Not enabled"
 msgstr ""
 
 #: lib/mv_web/live/contribution_period_live/show.ex:207
@@ -349,13 +339,7 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr ""
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
@@ -385,12 +369,12 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex:250
 #, elixir-autogen, elixir-format
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr ""
@@ -410,7 +394,7 @@ msgstr ""
 msgid "Use this form to manage user records in your database."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:266
+#: lib/mv_web/live/user_live/form.ex:268
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -438,7 +422,7 @@ msgstr ""
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex:267
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
@@ -514,30 +498,30 @@ msgid "User will be created without a password. Check 'Set Password' to add one.
 msgstr ""
 
 #: lib/mv_web/live/user_live/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:62
+#: lib/mv_web/live/member_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex:56
+#: lib/mv_web/live/user_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:72
+#: lib/mv_web/live/member_live/show.ex:73
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:36
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex:37
+#: lib/mv_web/live/member_live/show.ex:39
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr ""
@@ -619,7 +603,7 @@ msgid "Choose a custom field"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:77
+#: lib/mv_web/live/member_live/show.ex:78
 #, elixir-autogen, elixir-format
 msgid "Custom Field Values"
 msgstr ""
@@ -748,7 +732,7 @@ msgstr ""
 msgid "Available members"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex:359
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr ""
@@ -788,7 +772,7 @@ msgstr ""
 msgid "Unlinking scheduled"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex:160
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -805,12 +789,12 @@ msgstr ""
 msgid "Copy emails"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex:149
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex:146
 #, elixir-autogen, elixir-format
 msgid "No members selected"
 msgstr ""
@@ -825,7 +809,7 @@ msgstr ""
 msgid "Open in email program"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex:169
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
@@ -998,7 +982,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:344
+#: lib/mv_web/live/contribution_period_live/show.ex:343
 #: lib/mv_web/live/contribution_settings_live.ex:275
 #: lib/mv_web/live/contribution_type_live/index.ex:203
 #, elixir-autogen, elixir-format
@@ -1033,7 +1017,7 @@ msgstr ""
 msgid "Joining date"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:332
+#: lib/mv_web/live/contribution_period_live/show.ex:331
 #, elixir-autogen, elixir-format
 msgid "Joining year - reduced to 0"
 msgstr ""
@@ -1093,7 +1077,7 @@ msgstr ""
 msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:342
+#: lib/mv_web/live/contribution_period_live/show.ex:341
 #: lib/mv_web/live/contribution_settings_live.ex:273
 #: lib/mv_web/live/contribution_type_live/index.ex:201
 #, elixir-autogen, elixir-format
@@ -1135,19 +1119,19 @@ msgstr ""
 msgid "Open Contributions"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:302
+#: lib/mv_web/live/contribution_period_live/show.ex:301
 #, elixir-autogen, elixir-format
 msgid "Paid via bank transfer"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:226
+#: lib/mv_web/live/contribution_period_live/show.ex:225
 #: lib/mv_web/live/contribution_settings_live.ex:197
 #: lib/mv_web/live/contribution_type_live/index.ex:97
 #, elixir-autogen, elixir-format
 msgid "Preview Mockup"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:343
+#: lib/mv_web/live/contribution_period_live/show.ex:342
 #: lib/mv_web/live/contribution_settings_live.ex:274
 #: lib/mv_web/live/contribution_type_live/index.ex:202
 #, elixir-autogen, elixir-format
@@ -1176,7 +1160,7 @@ msgstr ""
 msgid "Reduced fee for unemployed, pensioners, or low income"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:276
+#: lib/mv_web/live/contribution_period_live/show.ex:275
 #: lib/mv_web/live/contribution_settings_live.ex:244
 #: lib/mv_web/live/contribution_type_live/index.ex:148
 #, elixir-autogen, elixir-format
@@ -1219,7 +1203,7 @@ msgstr ""
 msgid "Suspend"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:260
+#: lib/mv_web/live/contribution_period_live/show.ex:259
 #, elixir-autogen, elixir-format
 msgid "Suspended"
 msgstr ""
@@ -1229,7 +1213,7 @@ msgstr ""
 msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:228
+#: lib/mv_web/live/contribution_period_live/show.ex:227
 #: lib/mv_web/live/contribution_settings_live.ex:199
 #: lib/mv_web/live/contribution_type_live/index.ex:99
 #, elixir-autogen, elixir-format
@@ -1246,7 +1230,7 @@ msgstr ""
 msgid "Total Contributions"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:251
+#: lib/mv_web/live/contribution_period_live/show.ex:250
 #, elixir-autogen, elixir-format
 msgid "Unpaid"
 msgstr ""
@@ -1274,7 +1258,7 @@ msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex:85
 #: lib/mv_web/live/contribution_period_live/show.ex:86
 #: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_period_live/show.ex:345
+#: lib/mv_web/live/contribution_period_live/show.ex:344
 #: lib/mv_web/live/contribution_settings_live.ex:276
 #: lib/mv_web/live/contribution_type_live/index.ex:204
 #, elixir-autogen, elixir-format
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index cf081bf..ceee74a 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -11,14 +11,14 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex:387
 #: lib/mv_web/live/contribution_period_live/show.ex:141
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/user_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
@@ -31,28 +31,28 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:53
 #: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/show.ex:59
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
 
 #: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/user_live/index.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
 #: lib/mv_web/live/contribution_type_live/index.ex:66
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/user_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:41
-#: lib/mv_web/live/member_live/show.ex:116
+#: lib/mv_web/live/member_live/show.ex:42
+#: lib/mv_web/live/member_live/show.ex:114
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
@@ -60,29 +60,29 @@ msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex:58
 #: lib/mv_web/live/member_live/form.ex:47
 #: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/show.ex:51
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:48
+#: lib/mv_web/live/member_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:50
 #: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
@@ -93,7 +93,7 @@ msgid "New Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/user_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
@@ -114,21 +114,21 @@ msgid "close"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/show.ex:57
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:55
 #: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:60
+#: lib/mv_web/live/member_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
 #: lib/mv_web/live/contribution_period_live/show.ex:140
 #: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/show.ex:58
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
@@ -136,24 +136,24 @@ msgstr ""
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
 #: lib/mv_web/live/contribution_period_live/show.ex:186
-#: lib/mv_web/live/contribution_period_live/show.ex:242
+#: lib/mv_web/live/contribution_period_live/show.ex:241
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/member_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:49
 #: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:54
+#: lib/mv_web/live/member_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:56
 #: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:61
+#: lib/mv_web/live/member_live/show.ex:62
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
@@ -167,43 +167,43 @@ msgstr ""
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
 #: lib/mv_web/live/global_settings_live.ex:55
 #: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:54
 #: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:59
+#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:47
+#: lib/mv_web/live/member_live/show.ex:48
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:62
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:115
+#: lib/mv_web/live/member_live/show.ex:113
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "This is a member record from your database."
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
@@ -261,7 +261,7 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/index.ex:120
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/user_live/form.ex:252
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
@@ -281,16 +281,11 @@ msgstr ""
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_live/form.ex:62
 #, elixir-autogen, elixir-format
 msgid "Immutable"
@@ -314,7 +309,7 @@ msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:25
 #: lib/mv_web/live/contribution_type_live/index.ex:61
-#: lib/mv_web/live/member_live/index.ex:73
+#: lib/mv_web/live/member_live/index.ex:74
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
@@ -331,16 +326,11 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Not set"
-msgstr ""
-
 #: lib/mv_web/live/contribution_period_live/show.ex:207
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
@@ -349,13 +339,7 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr ""
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
@@ -385,12 +369,12 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex:250
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex:77
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show User"
 msgstr ""
@@ -410,7 +394,7 @@ msgstr ""
 msgid "Use this form to manage user records in your database."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:266
+#: lib/mv_web/live/user_live/form.ex:268
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -438,7 +422,7 @@ msgstr ""
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex:267
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
@@ -514,30 +498,30 @@ 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/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Linked Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:62
+#: lib/mv_web/live/member_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex:56
+#: lib/mv_web/live/user_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:72
+#: lib/mv_web/live/member_live/show.ex:73
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:36
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex:37
+#: lib/mv_web/live/member_live/show.ex:39
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr ""
@@ -619,7 +603,7 @@ msgid "Choose a custom field"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:77
+#: lib/mv_web/live/member_live/show.ex:78
 #, elixir-autogen, elixir-format
 msgid "Custom Field Values"
 msgstr ""
@@ -748,7 +732,7 @@ msgstr ""
 msgid "Available members"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex:359
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr ""
@@ -788,7 +772,7 @@ msgstr ""
 msgid "Unlinking scheduled"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex:160
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -805,12 +789,12 @@ msgstr ""
 msgid "Copy emails"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex:149
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex:146
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No members selected"
 msgstr ""
@@ -825,7 +809,7 @@ msgstr ""
 msgid "Open in email program"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex:169
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
@@ -998,7 +982,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:344
+#: lib/mv_web/live/contribution_period_live/show.ex:343
 #: lib/mv_web/live/contribution_settings_live.ex:275
 #: lib/mv_web/live/contribution_type_live/index.ex:203
 #, elixir-autogen, elixir-format
@@ -1033,7 +1017,7 @@ msgstr ""
 msgid "Joining date"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:332
+#: lib/mv_web/live/contribution_period_live/show.ex:331
 #, elixir-autogen, elixir-format
 msgid "Joining year - reduced to 0"
 msgstr ""
@@ -1093,7 +1077,7 @@ msgstr ""
 msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:342
+#: lib/mv_web/live/contribution_period_live/show.ex:341
 #: lib/mv_web/live/contribution_settings_live.ex:273
 #: lib/mv_web/live/contribution_type_live/index.ex:201
 #, elixir-autogen, elixir-format
@@ -1135,19 +1119,19 @@ msgstr ""
 msgid "Open Contributions"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:302
+#: lib/mv_web/live/contribution_period_live/show.ex:301
 #, elixir-autogen, elixir-format
 msgid "Paid via bank transfer"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:226
+#: lib/mv_web/live/contribution_period_live/show.ex:225
 #: lib/mv_web/live/contribution_settings_live.ex:197
 #: lib/mv_web/live/contribution_type_live/index.ex:97
 #, elixir-autogen, elixir-format
 msgid "Preview Mockup"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:343
+#: lib/mv_web/live/contribution_period_live/show.ex:342
 #: lib/mv_web/live/contribution_settings_live.ex:274
 #: lib/mv_web/live/contribution_type_live/index.ex:202
 #, elixir-autogen, elixir-format
@@ -1176,7 +1160,7 @@ msgstr ""
 msgid "Reduced fee for unemployed, pensioners, or low income"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:276
+#: lib/mv_web/live/contribution_period_live/show.ex:275
 #: lib/mv_web/live/contribution_settings_live.ex:244
 #: lib/mv_web/live/contribution_type_live/index.ex:148
 #, elixir-autogen, elixir-format
@@ -1219,7 +1203,7 @@ msgstr ""
 msgid "Suspend"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:260
+#: lib/mv_web/live/contribution_period_live/show.ex:259
 #, elixir-autogen, elixir-format
 msgid "Suspended"
 msgstr ""
@@ -1229,7 +1213,7 @@ msgstr ""
 msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:228
+#: lib/mv_web/live/contribution_period_live/show.ex:227
 #: lib/mv_web/live/contribution_settings_live.ex:199
 #: lib/mv_web/live/contribution_type_live/index.ex:99
 #, elixir-autogen, elixir-format
@@ -1246,7 +1230,7 @@ msgstr ""
 msgid "Total Contributions"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:251
+#: lib/mv_web/live/contribution_period_live/show.ex:250
 #, elixir-autogen, elixir-format
 msgid "Unpaid"
 msgstr ""
@@ -1274,7 +1258,7 @@ msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex:85
 #: lib/mv_web/live/contribution_period_live/show.ex:86
 #: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_period_live/show.ex:345
+#: lib/mv_web/live/contribution_period_live/show.ex:344
 #: lib/mv_web/live/contribution_settings_live.ex:276
 #: lib/mv_web/live/contribution_type_live/index.ex:204
 #, elixir-autogen, elixir-format
@@ -1297,6 +1281,22 @@ msgstr ""
 #~ msgid "Birth Date"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/user_live/show.ex:49
+#~ #, elixir-autogen, elixir-format
+#~ msgid "ID"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Not set"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/user_live/index.html.heex:52
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format
+#~ msgid "OIDC ID"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/contribution_period_live/show.ex:273
 #~ #: lib/mv_web/live/contribution_settings_live.ex:248
 #~ #, elixir-autogen, elixir-format
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index 0ee2364..853a326 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -123,7 +123,13 @@ defmodule MvWeb.ConnCase do
   end
 
   setup tags do
-    Mv.DataCase.setup_sandbox(tags)
-    {:ok, conn: Phoenix.ConnTest.build_conn()}
+    pid = Mv.DataCase.setup_sandbox(tags)
+
+    conn = Phoenix.ConnTest.build_conn()
+    # Set metadata for Phoenix.Ecto.SQL.Sandbox plug to allow LiveView processes
+    # to share the test's database connection in async tests
+    conn = Plug.Conn.put_private(conn, :ecto_sandbox, pid)
+
+    {:ok, conn: conn}
   end
 end
diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index 6e53c38..4ba75ef 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -34,10 +34,12 @@ defmodule Mv.DataCase do
 
   @doc """
   Sets up the sandbox based on the test tags.
+  Returns the owner pid for use with Phoenix.Ecto.SQL.Sandbox.
   """
   def setup_sandbox(tags) do
     pid = Ecto.Adapters.SQL.Sandbox.start_owner!(Mv.Repo, shared: not tags[:async])
     on_exit(fn -> Ecto.Adapters.SQL.Sandbox.stop_owner(pid) end)
+    pid
   end
 
   @doc """

From 94245cbc0fa8f8f425570c8da252dd5873cd0344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= <hello@rafa.ee>
Date: Wed, 3 Dec 2025 14:52:13 +0100
Subject: [PATCH 06/12] Skip writing line numbers in gettext file comments

---
 mix.exs                                |   3 +-
 priv/gettext/auth.pot                  |  33 +-
 priv/gettext/de/LC_MESSAGES/auth.po    |  33 +-
 priv/gettext/de/LC_MESSAGES/default.po | 465 ++++++++++++-------------
 priv/gettext/default.pot               | 445 +++++++++++------------
 priv/gettext/en/LC_MESSAGES/auth.po    |  33 +-
 priv/gettext/en/LC_MESSAGES/default.po | 465 ++++++++++++-------------
 7 files changed, 704 insertions(+), 773 deletions(-)

diff --git a/mix.exs b/mix.exs
index c6e4fb5..7a13ab0 100644
--- a/mix.exs
+++ b/mix.exs
@@ -12,7 +12,8 @@ defmodule Mv.MixProject do
       compilers: [:phoenix_live_view] ++ Mix.compilers(),
       aliases: aliases(),
       deps: deps(),
-      listeners: [Phoenix.CodeReloader]
+      listeners: [Phoenix.CodeReloader],
+      gettext: [write_reference_line_numbers: false]
     ]
   end
 
diff --git a/priv/gettext/auth.pot b/priv/gettext/auth.pot
index ebb8d3c..1cc60cb 100644
--- a/priv/gettext/auth.pot
+++ b/priv/gettext/auth.pot
@@ -36,7 +36,7 @@ msgstr ""
 msgid "Need an account?"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:268
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen
 msgid "Password"
 msgstr ""
@@ -65,78 +65,77 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:254
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "An account with email %{email} already exists. Please enter your password to link your OIDC account."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:289
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:163
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Incorrect password. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:37
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Invalid session. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:281
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Link Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Link OIDC Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:280
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Linking..."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:40
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Session expired. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:209
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Your OIDC account has been successfully linked! Redirecting to complete sign-in..."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:76
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Account activated! Redirecting to complete sign-in..."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:119
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:123
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Failed to link account. Please try again or contact support."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:108
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "The email address from your OIDC provider is already registered to another account. Please change your email in the identity provider or contact support."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:98
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "This OIDC account is already linked to another user. Please contact support."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:235
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Language selection"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:242
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr ""
diff --git a/priv/gettext/de/LC_MESSAGES/auth.po b/priv/gettext/de/LC_MESSAGES/auth.po
index f0cbdf3..cdcc9ff 100644
--- a/priv/gettext/de/LC_MESSAGES/auth.po
+++ b/priv/gettext/de/LC_MESSAGES/auth.po
@@ -35,7 +35,7 @@ msgstr "Falls diese*r Benutzer*in bekannt ist, wird jetzt eine Email mit einer A
 msgid "Need an account?"
 msgstr "Konto anlegen?"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:268
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen
 msgid "Password"
 msgstr "Passwort"
@@ -64,78 +64,77 @@ msgstr "Anmelden..."
 msgid "Your password has successfully been reset"
 msgstr "Das Passwort wurde erfolgreich zurückgesetzt"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:254
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "An account with email %{email} already exists. Please enter your password to link your OIDC account."
 msgstr "Ein Konto mit der E-Mail %{email} existiert bereits. Bitte geben Sie Ihr Passwort ein, um Ihr OIDC-Konto zu verknüpfen."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:289
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:163
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Incorrect password. Please try again."
 msgstr "Falsches Passwort. Bitte versuchen Sie es erneut."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:37
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Invalid session. Please try again."
 msgstr "Ungültige Sitzung. Bitte versuchen Sie es erneut."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:281
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Link Account"
 msgstr "Konto verknüpfen"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Link OIDC Account"
 msgstr "OIDC-Konto verknüpfen"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:280
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Linking..."
 msgstr "Verknüpfen..."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:40
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Session expired. Please try again."
 msgstr "Sitzung abgelaufen. Bitte versuchen Sie es erneut."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:209
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Your OIDC account has been successfully linked! Redirecting to complete sign-in..."
 msgstr "Ihr OIDC-Konto wurde erfolgreich verknüpft! Sie werden zur Anmeldung weitergeleitet..."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:76
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Account activated! Redirecting to complete sign-in..."
 msgstr "Konto aktiviert! Sie werden zur Anmeldung weitergeleitet..."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:119
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:123
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Failed to link account. Please try again or contact support."
 msgstr "Verknüpfung des Kontos fehlgeschlagen. Bitte versuchen Sie es erneut oder kontaktieren Sie den Support."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:108
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "The email address from your OIDC provider is already registered to another account. Please change your email in the identity provider or contact support."
 msgstr "Die E-Mail-Adresse aus Ihrem OIDC-Provider ist bereits für ein anderes Konto registriert. Bitte ändern Sie Ihre E-Mail-Adresse im Identity-Provider oder kontaktieren Sie den Support."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:98
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "This OIDC account is already linked to another user. Please contact support."
 msgstr "Dieses OIDC-Konto ist bereits mit einem anderen Benutzer verknüpft. Bitte kontaktieren Sie den Support."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:235
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Language selection"
 msgstr "Sprachauswahl"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:242
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr "Sprache auswählen"
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 66bcec1..9c4a4fb 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -10,851 +10,834 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr "Aktionen"
 
-#: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr "Bist du sicher?"
 
-#: lib/mv_web/components/layouts.ex:82
-#: lib/mv_web/components/layouts.ex:94
+#: lib/mv_web/components/layouts.ex
 #, elixir-autogen, elixir-format
 msgid "Attempting to reconnect"
 msgstr "Verbindung wird wiederhergestellt"
 
-#: lib/mv_web/live/member_live/form.ex:53
-#: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr "Stadt"
 
-#: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr "Löschen"
 
-#: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: lib/mv_web/live/member_live/show.ex:41
-#: lib/mv_web/live/member_live/show.ex:116
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr "Mitglied bearbeiten"
 
-#: lib/mv_web/live/member_live/form.ex:47
-#: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:50
-#: lib/mv_web/live/user_live/form.ex:46
-#: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/index.html.heex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr "E-Mail"
 
-#: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:48
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr "Vorname"
 
-#: lib/mv_web/live/member_live/form.ex:50
-#: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr "Beitrittsdatum"
 
-#: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr "Nachname"
 
-#: lib/mv_web/live/member_live/index.html.heex:29
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "New Member"
 msgstr "Neues Mitglied"
 
-#: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr "Anzeigen"
 
-#: lib/mv_web/components/layouts.ex:89
+#: lib/mv_web/components/layouts.ex
 #, elixir-autogen, elixir-format
 msgid "Something went wrong!"
 msgstr "Etwas ist schiefgelaufen!"
 
-#: lib/mv_web/components/layouts.ex:77
+#: lib/mv_web/components/layouts.ex
 #, elixir-autogen, elixir-format
 msgid "We can't find the internet"
 msgstr "Keine Internetverbindung gefunden"
 
-#: lib/mv_web/components/core_components.ex:82
+#: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format
 msgid "close"
 msgstr "schließen"
 
-#: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr "Austrittsdatum"
 
-#: lib/mv_web/live/member_live/form.ex:55
-#: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:60
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr "Hausnummer"
 
-#: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Notizen"
 
-#: lib/mv_web/live/components/payment_filter_component.ex:94
-#: lib/mv_web/live/components/payment_filter_component.ex:144
-#: lib/mv_web/live/member_live/form.ex:48
-#: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/components/payment_filter_component.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr "Bezahlt"
 
-#: lib/mv_web/live/member_live/form.ex:49
-#: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:54
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: lib/mv_web/live/member_live/form.ex:56
-#: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:61
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: lib/mv_web/live/member_live/form.ex:79
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save Member"
 msgstr "Mitglied speichern"
 
-#: lib/mv_web/live/custom_field_live/form.ex:66
-#: lib/mv_web/live/custom_field_value_live/form.ex:74
-#: lib/mv_web/live/global_settings_live.ex:55
-#: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/global_settings_live.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: lib/mv_web/live/member_live/form.ex:54
-#: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:59
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr "Straße"
 
-#: lib/mv_web/live/member_live/show.ex:47
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr "ID"
 
-#: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/index/formatter.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr "Nein"
 
-#: lib/mv_web/live/member_live/show.ex:115
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr "Mitglied anzeigen"
 
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "This is a member record from your database."
 msgstr "Dies ist ein Mitglied aus deiner Datenbank."
 
-#: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/index/formatter.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/mv_web/live/custom_field_live/form.ex:110
-#: lib/mv_web/live/custom_field_value_live/form.ex:233
-#: lib/mv_web/live/member_live/form.ex:137
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr "erstellt"
 
-#: lib/mv_web/live/custom_field_live/form.ex:111
-#: lib/mv_web/live/custom_field_value_live/form.ex:234
-#: lib/mv_web/live/member_live/form.ex:138
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "update"
 msgstr "aktualisiert"
 
-#: lib/mv_web/controllers/auth_controller.ex:60
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Incorrect email or password"
 msgstr "Falsche E-Mail oder Passwort"
 
-#: lib/mv_web/live/member_live/form.ex:144
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Member %{action} successfully"
 msgstr "Mitglied %{action} erfolgreich"
 
-#: lib/mv_web/controllers/auth_controller.ex:26
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "You are now signed in"
 msgstr "Sie sind jetzt angemeldet"
 
-#: lib/mv_web/controllers/auth_controller.ex:186
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "You are now signed out"
 msgstr "Sie sind jetzt abgemeldet"
 
-#: lib/mv_web/controllers/auth_controller.ex:85
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "You have already signed in another way, but have not confirmed your account.\nYou can confirm your account using the link we sent to you, or by resetting your password.\n"
 msgstr "Sie haben sich bereits auf andere Weise angemeldet, aber Ihr Konto noch nicht bestätigt.\nSie können Ihr Konto über den Link bestätigen, den wir Ihnen gesendet haben, oder durch Zurücksetzen Ihres Passworts.\n"
 
-#: lib/mv_web/controllers/auth_controller.ex:24
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Your email address has now been confirmed"
 msgstr "Ihre E-Mail-Adresse wurde bestätigt"
 
-#: lib/mv_web/controllers/auth_controller.ex:25
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Your password has successfully been reset"
 msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt"
 
-#: lib/mv_web/live/custom_field_live/form.ex:69
-#: lib/mv_web/live/custom_field_live/index.ex:120
-#: lib/mv_web/live/custom_field_value_live/form.ex:77
-#: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:62
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Choose a member"
 msgstr "Mitglied auswählen"
 
-#: lib/mv_web/live/custom_field_live/form.ex:61
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Beschreibung"
 
-#: lib/mv_web/live/user_live/show.ex:43
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Edit User"
 msgstr "Benutzer*in bearbeiten"
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr "ID"
-
-#: lib/mv_web/live/custom_field_live/form.ex:62
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr "Unveränderlich"
 
-#: lib/mv_web/components/layouts/navbar.ex:102
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr "Abmelden"
 
-#: lib/mv_web/live/user_live/index.ex:33
-#: lib/mv_web/live/user_live/index.html.heex:3
+#: lib/mv_web/live/user_live/index.ex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Listing Users"
 msgstr "Benutzer*innen auflisten"
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:60
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Member"
 msgstr "Mitglied"
 
-#: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/member_live/index.ex:73
-#: lib/mv_web/live/member_live/index.html.heex:3
+#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/member_live/index.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr "Mitglieder"
 
-#: lib/mv_web/live/custom_field_live/form.ex:51
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr "Name"
 
-#: lib/mv_web/live/user_live/index.html.heex:6
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "New User"
 msgstr "Neue*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr "Nicht aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "Not set"
-msgstr "Nicht gesetzt"
-
-#: lib/mv_web/live/user_live/form.ex:107
-#: lib/mv_web/live/user_live/form.ex:115
-#: lib/mv_web/live/user_live/form.ex:224
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Note"
 msgstr "Hinweis"
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr "OIDC ID"
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr "Passwort-Authentifizierung"
 
-#: lib/mv_web/components/layouts/navbar.ex:95
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr "Profil"
 
-#: lib/mv_web/live/custom_field_live/form.ex:63
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr "Erforderlich"
 
-#: lib/mv_web/live/member_live/index.html.heex:68
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Select all members"
 msgstr "Alle Mitglieder auswählen"
 
-#: lib/mv_web/live/member_live/index.html.heex:82
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Select member"
 msgstr "Mitglied auswählen"
 
-#: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save User"
 msgstr "Benutzer*in speichern"
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr "Benutzer*in anzeigen"
 
-#: lib/mv_web/live/user_live/show.ex:35
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "This is a user record from your database."
 msgstr "Dies ist ein Benutzer*innen-Datensatz aus Ihrer Datenbank."
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:128
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Unsupported value type: %{type}"
 msgstr "Nicht unterstützter Wertetyp: %{type}"
 
-#: lib/mv_web/live/user_live/form.ex:42
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Use this form to manage user records in your database."
 msgstr "Verwenden Sie dieses Formular, um Benutzer*innen-Datensätze zu verwalten."
 
-#: lib/mv_web/live/user_live/form.ex:266
-#: lib/mv_web/live/user_live/show.ex:34
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "User"
 msgstr "Benutzer*in"
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:92
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Value"
 msgstr "Wert"
 
-#: lib/mv_web/live/custom_field_live/form.ex:56
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr "Wertetyp"
 
-#: lib/mv_web/components/table_components.ex:30
-#: lib/mv_web/live/components/sort_header_component.ex:57
+#: lib/mv_web/components/table_components.ex
+#: lib/mv_web/live/components/sort_header_component.ex
 #, elixir-autogen, elixir-format
 msgid "ascending"
 msgstr "aufsteigend"
 
-#: lib/mv_web/components/table_components.ex:30
-#: lib/mv_web/live/components/sort_header_component.ex:58
+#: lib/mv_web/components/table_components.ex
+#: lib/mv_web/live/components/sort_header_component.ex
 #, elixir-autogen, elixir-format
 msgid "descending"
 msgstr "absteigend"
 
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr "Neue*r"
 
-#: lib/mv_web/live/user_live/form.ex:96
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Admin Note"
 msgstr "Administrator*innen-Hinweis"
 
-#: lib/mv_web/live/user_live/form.ex:96
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "As an administrator, you can directly set a new password for this user using the same secure Ash Authentication system."
 msgstr "Als Administrator*in können Sie direkt ein neues Passwort für diese*n Benutzer*in setzen, wobei das gleiche sichere Ash Authentication System verwendet wird."
 
-#: lib/mv_web/live/user_live/form.ex:87
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "At least 8 characters"
 msgstr "Mindestens 8 Zeichen"
 
-#: lib/mv_web/live/user_live/form.ex:59
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: lib/mv_web/live/user_live/form.ex:107
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Check 'Change Password' above to set a new password for this user."
 msgstr "Aktivieren Sie 'Passwort ändern' oben, um ein neues Passwort für diese*n Benutzer*in zu setzen."
 
-#: lib/mv_web/live/user_live/form.ex:77
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Confirm Password"
 msgstr "Passwort bestätigen"
 
-#: lib/mv_web/live/user_live/form.ex:89
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Consider using special characters"
 msgstr "Sonderzeichen empfohlen"
 
-#: lib/mv_web/live/user_live/form.ex:88
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Include both letters and numbers"
 msgstr "Buchstaben und Zahlen verwenden"
 
-#: lib/mv_web/live/user_live/form.ex:67
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr "Passwort"
 
-#: lib/mv_web/live/user_live/form.ex:85
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Password requirements"
 msgstr "Passwort-Anforderungen"
 
-#: lib/mv_web/live/user_live/index.html.heex:21
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Select all users"
 msgstr "Alle Benutzer*innen auswählen"
 
-#: lib/mv_web/live/user_live/index.html.heex:35
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Select user"
 msgstr "Benutzer*in auswählen"
 
-#: lib/mv_web/live/user_live/form.ex:59
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Set Password"
 msgstr "Passwort setzen"
 
-#: lib/mv_web/live/user_live/form.ex:115
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "User will be created without a password. Check 'Set Password' to add one."
 msgstr "Benutzer*in wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen."
 
-#: lib/mv_web/live/user_live/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/index.html.heex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr "Verknüpftes Mitglied"
 
-#: lib/mv_web/live/member_live/show.ex:62
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr "Verknüpfte*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr "Kein Mitglied verknüpft"
 
-#: lib/mv_web/live/member_live/show.ex:72
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr "Keine*r Benutzer*in verknüpft"
 
-#: lib/mv_web/live/member_live/show.ex:36
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr "Zurück zur Mitgliederliste"
 
-#: lib/mv_web/live/user_live/show.ex:38
-#: lib/mv_web/live/user_live/show.ex:40
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Back to users list"
 msgstr "Zurück zur Benutzer*innen-Liste"
 
-#: lib/mv_web/components/layouts/navbar.ex:33
-#: lib/mv_web/components/layouts/navbar.ex:39
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr "Sprache auswählen"
 
-#: lib/mv_web/components/layouts/navbar.ex:46
-#: lib/mv_web/components/layouts/navbar.ex:66
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr "Dunklen Modus umschalten"
 
-#: lib/mv_web/live/components/search_bar_component.ex:15
-#: lib/mv_web/live/member_live/index.html.heex:39
+#: lib/mv_web/live/components/search_bar_component.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Search..."
 msgstr "Suchen..."
 
-#: lib/mv_web/components/layouts/navbar.ex:27
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Users"
 msgstr "Benutzer*innen"
 
-#: lib/mv_web/live/components/sort_header_component.ex:59
-#: lib/mv_web/live/components/sort_header_component.ex:63
+#: lib/mv_web/live/components/sort_header_component.ex
 #, elixir-autogen, elixir-format
 msgid "Click to sort"
 msgstr "Klicke um zu sortieren"
 
-#: lib/mv_web/live/member_live/index.html.heex:94
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "First name"
 msgstr "Vorname"
 
-#: lib/mv_web/controllers/auth_controller.ex:167
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "An account with this email already exists. Please verify your password to link your OIDC account."
 msgstr "Ein Konto mit dieser E-Mail existiert bereits. Bitte verifizieren Sie Ihr Passwort, um Ihr OIDC-Konto zu verknüpfen."
 
-#: lib/mv_web/controllers/auth_controller.ex:77
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Unable to authenticate with OIDC. Please try again."
 msgstr "OIDC-Authentifizierung fehlgeschlagen. Bitte versuchen Sie es erneut."
 
-#: lib/mv_web/controllers/auth_controller.ex:152
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Unable to sign in. Please try again."
 msgstr "Anmeldung fehlgeschlagen. Bitte versuchen Sie es erneut."
 
-#: lib/mv_web/controllers/auth_controller.ex:92
-#: lib/mv_web/controllers/auth_controller.ex:97
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Authentication failed. Please try again."
 msgstr "Authentifizierung fehlgeschlagen. Bitte versuchen Sie es erneut."
 
-#: lib/mv_web/controllers/auth_controller.ex:124
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Cannot update email: This email is already registered to another account. Please change your email in the identity provider."
 msgstr "E-Mail kann nicht aktualisiert werden: Diese E-Mail-Adresse ist bereits für ein anderes Konto registriert. Bitte ändern Sie Ihre E-Mail-Adresse im Identity-Provider."
 
-#: lib/mv_web/controllers/auth_controller.ex:130
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "This email is already linked to a different OIDC account. Cannot link multiple OIDC providers to the same account."
 msgstr "Diese E-Mail-Adresse ist bereits mit einem anderen OIDC-Konto verknüpft. Es können nicht mehrere OIDC-Provider mit demselben Konto verknüpft werden."
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:53
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Choose a custom field"
 msgstr "Wähle ein Benutzerdefiniertes Feld"
 
-#: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:77
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Custom Field Values"
 msgstr "Benutzerdefinierte Feldwerte"
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:51
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field"
 msgstr "Benutzerdefiniertes Feld"
 
-#: lib/mv_web/live/custom_field_live/form.ex:117
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr "Benutzerdefiniertes Feld erfolgreich %{action}"
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:242
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field value %{action} successfully"
 msgstr "Benutzerdefinierter Feldwert erfolgreich %{action}"
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:70
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Please select a custom field first"
 msgstr "Bitte wähle zuerst ein Benutzerdefiniertes Feld"
 
-#: lib/mv_web/live/custom_field_live/form.ex:67
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr "Benutzerdefiniertes Feld speichern"
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:75
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save Custom field value"
 msgstr "Benutzerdefinierten Feldwert speichern"
 
-#: lib/mv_web/live/custom_field_live/form.ex:46
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Use this form to manage custom_field records in your database."
 msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten."
 
-#: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Custom Fields"
 msgstr "Benutzerdefinierte Felder"
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:42
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr "Verwende dieses Formular, um Benutzerdefinierte Feldwerte in deiner Datenbank zu verwalten."
 
-#: lib/mv_web/live/custom_field_live/show.ex:56
+#: lib/mv_web/live/custom_field_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Auto-generated identifier (immutable)"
 msgstr "Automatisch generierter Bezeichner (unveränderlich)"
 
-#: lib/mv_web/live/custom_field_live/index.ex:79
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] "%{count} Mitglied hat einen Wert für dieses benutzerdefinierte Feld zugewiesen."
 msgstr[1] "%{count} Mitglieder haben Werte für dieses benutzerdefinierte Feld zugewiesen."
 
-#: lib/mv_web/live/custom_field_live/index.ex:87
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr "Alle benutzerdefinierten Feldwerte werden beim Löschen dieses benutzerdefinierten Feldes dauerhaft gelöscht."
 
-#: lib/mv_web/live/custom_field_live/index.ex:72
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr "Benutzerdefiniertes Feld löschen"
 
-#: lib/mv_web/live/custom_field_live/index.ex:127
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr "Benutzerdefiniertes Feld und alle Werte löschen"
 
-#: lib/mv_web/live/custom_field_live/index.ex:109
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr "Obigen Text zur Bestätigung eingeben"
 
-#: lib/mv_web/live/custom_field_live/index.ex:97
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "To confirm deletion, please enter this text:"
 msgstr "Um die Löschung zu bestätigen, gib bitte folgenden Text ein:"
 
-#: lib/mv_web/live/custom_field_live/form.ex:64
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr "In der Mitglieder-Übersicht anzeigen"
 
-#: lib/mv_web/live/global_settings_live.ex:51
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Association Name"
 msgstr "Vereinsname"
 
-#: lib/mv_web/live/global_settings_live.ex:31
-#: lib/mv_web/live/global_settings_live.ex:41
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Club Settings"
 msgstr "Vereinsdaten"
 
-#: lib/mv_web/live/global_settings_live.ex:43
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Manage global settings for the association."
 msgstr "Passe übergreifende Einstellungen für den Verein an."
 
-#: lib/mv_web/live/global_settings_live.ex:56
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: lib/mv_web/live/global_settings_live.ex:75
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
 msgstr "Einstellungen erfolgreich gespeichert"
 
-#: lib/mv_web/live/user_live/form.ex:224
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first."
 msgstr "Ein Mitglied mit dieser E-Mail-Adresse existiert bereits. Um mit einem anderen Mitglied zu verknüpfen, ändern Sie bitte zuerst eine der E-Mail-Adressen."
 
-#: lib/mv_web/live/user_live/form.ex:192
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Available members"
 msgstr "Verfügbare Mitglieder"
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr "Fehler beim Verlinken des Mitglieds: %{error}"
 
-#: lib/mv_web/live/user_live/form.ex:152
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Member will be unlinked when you save. Cannot select new member until saved."
 msgstr "Mitglied wird beim Speichern entverknüpft. Neues Mitglied kann erst nach dem Speichern ausgewählt werden."
 
-#: lib/mv_web/live/user_live/form.ex:240
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save to confirm linking."
 msgstr "Speichern, um die Verknüpfung zu bestätigen."
 
-#: lib/mv_web/live/user_live/form.ex:171
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Search for a member to link..."
 msgstr "Nach einem Mitglied zum Verknüpfen suchen..."
 
-#: lib/mv_web/live/user_live/form.ex:175
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Search for member to link"
 msgstr "Nach Mitglied zum Verknüpfen suchen"
 
-#: lib/mv_web/live/user_live/form.ex:237
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Selected"
 msgstr "Ausgewählt"
 
-#: lib/mv_web/live/user_live/form.ex:143
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Unlink Member"
 msgstr "Mitglied entverknüpfen"
 
-#: lib/mv_web/live/user_live/form.ex:152
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Unlinking scheduled"
 msgstr "Entverknüpfung geplant"
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
 msgstr[0] "%{count} E-Mail-Adresse in die Zwischenablage kopiert"
 msgstr[1] "%{count} E-Mail-Adressen in die Zwischenablage kopiert"
 
-#: lib/mv_web/live/member_live/index.html.heex:10
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Copy email addresses of selected members"
 msgstr "E-Mail-Adressen der ausgewählten Mitglieder kopieren"
 
-#: lib/mv_web/live/member_live/index.html.heex:13
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Copy emails"
 msgstr "E-Mails kopieren"
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr "Keine E-Mail-Adressen gefunden"
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "No members selected"
 msgstr "Keine Mitglieder ausgewählt"
 
-#: lib/mv_web/live/member_live/index.html.heex:23
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Open email program with BCC recipients"
 msgstr "E-Mail-Programm mit BCC-Empfänger*innen öffnen"
 
-#: lib/mv_web/live/member_live/index.html.heex:26
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Open in email program"
 msgstr "Im E-Mail-Programm öffnen"
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr "Tipp: E-Mail-Adressen ins BCC-Feld einfügen für Datenschutzkonformität"
 
-#: lib/mv_web/live/member_live/form.ex:40
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Fields marked with an asterisk (*) cannot be empty."
 msgstr "Felder, die mit einem Sternchen (*) markiert sind, dürfen nicht leer bleiben."
 
-#: lib/mv_web/components/core_components.ex:206
-#: lib/mv_web/components/core_components.ex:223
-#: lib/mv_web/components/core_components.ex:250
-#: lib/mv_web/components/core_components.ex:277
+#: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This field cannot be empty"
 msgstr "Dieses Feld darf nicht leer bleiben"
 
-#: lib/mv_web/live/components/payment_filter_component.ex:80
-#: lib/mv_web/live/components/payment_filter_component.ex:143
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr "Alle"
 
-#: lib/mv_web/live/components/payment_filter_component.ex:54
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "Filter by payment status"
 msgstr "Nach Zahlungsstatus filtern"
 
-#: lib/mv_web/live/components/payment_filter_component.ex:108
-#: lib/mv_web/live/components/payment_filter_component.ex:145
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "Not paid"
 msgstr "Nicht bezahlt"
 
-#: lib/mv_web/live/components/payment_filter_component.ex:65
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "Payment filter"
 msgstr "Zahlungsfilter"
 
-#~ #: lib/mv_web/live/member_live/form.ex:48
-#~ #: lib/mv_web/live/member_live/show.ex:51
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Birth Date"
 #~ msgstr "Geburtsdatum"
+
+#~ #: lib/mv_web/live/user_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ #: lib/mv_web/live/user_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Not set"
+#~ msgstr "Nicht gesetzt"
+
+#~ #: lib/mv_web/live/user_live/index.html.heex
+#~ #: lib/mv_web/live/user_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "OIDC ID"
+#~ msgstr "OIDC ID"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 1e0e954..e865136 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -11,845 +11,812 @@
 msgid ""
 msgstr ""
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:82
-#: lib/mv_web/components/layouts.ex:94
+#: lib/mv_web/components/layouts.ex
 #, elixir-autogen, elixir-format
 msgid "Attempting to reconnect"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:53
-#: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:41
-#: lib/mv_web/live/member_live/show.ex:116
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:47
-#: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:50
-#: lib/mv_web/live/user_live/form.ex:46
-#: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/index.html.heex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:48
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:50
-#: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:29
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "New Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:89
+#: lib/mv_web/components/layouts.ex
 #, elixir-autogen, elixir-format
 msgid "Something went wrong!"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:77
+#: lib/mv_web/components/layouts.ex
 #, elixir-autogen, elixir-format
 msgid "We can't find the internet"
 msgstr ""
 
-#: lib/mv_web/components/core_components.ex:82
+#: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format
 msgid "close"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:55
-#: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:60
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
-#: lib/mv_web/live/components/payment_filter_component.ex:94
-#: lib/mv_web/live/components/payment_filter_component.ex:144
-#: lib/mv_web/live/member_live/form.ex:48
-#: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/components/payment_filter_component.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:49
-#: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:54
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:56
-#: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:61
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:79
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save Member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:66
-#: lib/mv_web/live/custom_field_value_live/form.ex:74
-#: lib/mv_web/live/global_settings_live.ex:55
-#: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/global_settings_live.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:54
-#: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:59
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:47
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/index/formatter.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:115
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Show Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "This is a member record from your database."
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/index/formatter.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:110
-#: lib/mv_web/live/custom_field_value_live/form.ex:233
-#: lib/mv_web/live/member_live/form.ex:137
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:111
-#: lib/mv_web/live/custom_field_value_live/form.ex:234
-#: lib/mv_web/live/member_live/form.ex:138
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "update"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:60
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Incorrect email or password"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:144
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Member %{action} successfully"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:26
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "You are now signed in"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:186
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "You are now signed out"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:85
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "You have already signed in another way, but have not confirmed your account.\nYou can confirm your account using the link we sent to you, or by resetting your password.\n"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:24
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Your email address has now been confirmed"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:25
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:69
-#: lib/mv_web/live/custom_field_live/index.ex:120
-#: lib/mv_web/live/custom_field_value_live/form.ex:77
-#: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:62
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Choose a member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:61
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:43
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/form.ex:62
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:102
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.ex:33
-#: lib/mv_web/live/user_live/index.html.heex:3
+#: lib/mv_web/live/user_live/index.ex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Listing Users"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:60
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/member_live/index.ex:73
-#: lib/mv_web/live/member_live/index.html.heex:3
+#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/member_live/index.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:51
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:6
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "Not set"
-msgstr ""
-
-#: lib/mv_web/live/user_live/form.ex:107
-#: lib/mv_web/live/user_live/form.ex:115
-#: lib/mv_web/live/user_live/form.ex:224
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr ""
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:95
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:63
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:68
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Select all members"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:82
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:35
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "This is a user record from your database."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:128
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Unsupported value type: %{type}"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:42
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Use this form to manage user records in your database."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:266
-#: lib/mv_web/live/user_live/show.ex:34
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "User"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:92
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:56
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr ""
 
-#: lib/mv_web/components/table_components.ex:30
-#: lib/mv_web/live/components/sort_header_component.ex:57
+#: lib/mv_web/components/table_components.ex
+#: lib/mv_web/live/components/sort_header_component.ex
 #, elixir-autogen, elixir-format
 msgid "ascending"
 msgstr ""
 
-#: lib/mv_web/components/table_components.ex:30
-#: lib/mv_web/live/components/sort_header_component.ex:58
+#: lib/mv_web/components/table_components.ex
+#: lib/mv_web/live/components/sort_header_component.ex
 #, elixir-autogen, elixir-format
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:96
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Admin Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:96
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "As an administrator, you can directly set a new password for this user using the same secure Ash Authentication system."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:87
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "At least 8 characters"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:59
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Change Password"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:107
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Check 'Change Password' above to set a new password for this user."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:77
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Confirm Password"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:89
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Consider using special characters"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:88
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Include both letters and numbers"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:67
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:85
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Password requirements"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:21
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Select all users"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:35
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Select user"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:59
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Set Password"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:115
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "User will be created without a password. Check 'Set Password' to add one."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/index.html.heex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:62
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:72
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:36
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:38
-#: lib/mv_web/live/user_live/show.ex:40
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Back to users list"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:33
-#: lib/mv_web/components/layouts/navbar.ex:39
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:46
-#: lib/mv_web/components/layouts/navbar.ex:66
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr ""
 
-#: lib/mv_web/live/components/search_bar_component.ex:15
-#: lib/mv_web/live/member_live/index.html.heex:39
+#: lib/mv_web/live/components/search_bar_component.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Search..."
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:27
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Users"
 msgstr ""
 
-#: lib/mv_web/live/components/sort_header_component.ex:59
-#: lib/mv_web/live/components/sort_header_component.ex:63
+#: lib/mv_web/live/components/sort_header_component.ex
 #, elixir-autogen, elixir-format
 msgid "Click to sort"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:94
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "First name"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:167
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "An account with this email already exists. Please verify your password to link your OIDC account."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:77
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Unable to authenticate with OIDC. Please try again."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:152
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Unable to sign in. Please try again."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:92
-#: lib/mv_web/controllers/auth_controller.ex:97
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Authentication failed. Please try again."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:124
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Cannot update email: This email is already registered to another account. Please change your email in the identity provider."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:130
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "This email is already linked to a different OIDC account. Cannot link multiple OIDC providers to the same account."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:53
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Choose a custom field"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:77
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Custom Field Values"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:51
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:117
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:242
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field value %{action} successfully"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:70
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Please select a custom field first"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:67
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:75
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save Custom field value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:46
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Use this form to manage custom_field records in your database."
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Custom Fields"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:42
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/show.ex:56
+#: lib/mv_web/live/custom_field_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Auto-generated identifier (immutable)"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:79
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:87
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:72
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:127
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:109
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:97
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "To confirm deletion, please enter this text:"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:64
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:51
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Association Name"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:31
-#: lib/mv_web/live/global_settings_live.ex:41
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Club Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:43
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Manage global settings for the association."
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:56
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Save Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:75
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:224
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:192
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Available members"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:152
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Member will be unlinked when you save. Cannot select new member until saved."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:240
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save to confirm linking."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:171
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Search for a member to link..."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:175
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Search for member to link"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:237
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Selected"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:143
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Unlink Member"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:152
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Unlinking scheduled"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/member_live/index.html.heex:10
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Copy email addresses of selected members"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:13
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Copy emails"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "No members selected"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:23
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Open email program with BCC recipients"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:26
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Open in email program"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:40
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Fields marked with an asterisk (*) cannot be empty."
 msgstr ""
 
-#: lib/mv_web/components/core_components.ex:206
-#: lib/mv_web/components/core_components.ex:223
-#: lib/mv_web/components/core_components.ex:250
-#: lib/mv_web/components/core_components.ex:277
+#: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format
 msgid "This field cannot be empty"
 msgstr ""
 
-#: lib/mv_web/live/components/payment_filter_component.ex:80
-#: lib/mv_web/live/components/payment_filter_component.ex:143
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr ""
 
-#: lib/mv_web/live/components/payment_filter_component.ex:54
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "Filter by payment status"
 msgstr ""
 
-#: lib/mv_web/live/components/payment_filter_component.ex:108
-#: lib/mv_web/live/components/payment_filter_component.ex:145
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "Not paid"
 msgstr ""
 
-#: lib/mv_web/live/components/payment_filter_component.ex:65
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "Payment filter"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/auth.po b/priv/gettext/en/LC_MESSAGES/auth.po
index 921d76b..561ead8 100644
--- a/priv/gettext/en/LC_MESSAGES/auth.po
+++ b/priv/gettext/en/LC_MESSAGES/auth.po
@@ -32,7 +32,7 @@ msgstr ""
 msgid "Need an account?"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:268
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen
 msgid "Password"
 msgstr ""
@@ -61,78 +61,77 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:254
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "An account with email %{email} already exists. Please enter your password to link your OIDC account."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:289
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:163
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Incorrect password. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:37
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Invalid session. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:281
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Link Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Link OIDC Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:280
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Linking..."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:40
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Session expired. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:209
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Your OIDC account has been successfully linked! Redirecting to complete sign-in..."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:76
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Account activated! Redirecting to complete sign-in..."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:119
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:123
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Failed to link account. Please try again or contact support."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:108
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "The email address from your OIDC provider is already registered to another account. Please change your email in the identity provider or contact support."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:98
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "This OIDC account is already linked to another user. Please contact support."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:235
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Language selection"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:242
+#: lib/mv_web/live/auth/link_oidc_account_live.ex
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 319bcc3..74eded2 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -11,851 +11,834 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:82
-#: lib/mv_web/components/layouts.ex:94
+#: lib/mv_web/components/layouts.ex
 #, elixir-autogen, elixir-format
 msgid "Attempting to reconnect"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:53
-#: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:41
-#: lib/mv_web/live/member_live/show.ex:116
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:47
-#: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:50
-#: lib/mv_web/live/user_live/form.ex:46
-#: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/index.html.heex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:48
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:50
-#: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:29
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "New Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:89
+#: lib/mv_web/components/layouts.ex
 #, elixir-autogen, elixir-format
 msgid "Something went wrong!"
 msgstr ""
 
-#: lib/mv_web/components/layouts.ex:77
+#: lib/mv_web/components/layouts.ex
 #, elixir-autogen, elixir-format
 msgid "We can't find the internet"
 msgstr ""
 
-#: lib/mv_web/components/core_components.ex:82
+#: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format
 msgid "close"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:55
-#: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:60
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
-#: lib/mv_web/live/components/payment_filter_component.ex:94
-#: lib/mv_web/live/components/payment_filter_component.ex:144
-#: lib/mv_web/live/member_live/form.ex:48
-#: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/components/payment_filter_component.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:49
-#: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:54
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:56
-#: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:61
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:79
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:66
-#: lib/mv_web/live/custom_field_value_live/form.ex:74
-#: lib/mv_web/live/global_settings_live.ex:55
-#: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/global_settings_live.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:54
-#: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:59
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:47
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/index/formatter.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:115
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "This is a member record from your database."
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index.html.heex
+#: lib/mv_web/live/member_live/index/formatter.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:110
-#: lib/mv_web/live/custom_field_value_live/form.ex:233
-#: lib/mv_web/live/member_live/form.ex:137
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:111
-#: lib/mv_web/live/custom_field_value_live/form.ex:234
-#: lib/mv_web/live/member_live/form.ex:138
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "update"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:60
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Incorrect email or password"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:144
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Member %{action} successfully"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:26
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "You are now signed in"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:186
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "You are now signed out"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:85
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "You have already signed in another way, but have not confirmed your account.\nYou can confirm your account using the link we sent to you, or by resetting your password.\n"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:24
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Your email address has now been confirmed"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:25
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:69
-#: lib/mv_web/live/custom_field_live/index.ex:120
-#: lib/mv_web/live/custom_field_value_live/form.ex:77
-#: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_value_live/form.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:62
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Choose a member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:61
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:43
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/form.ex:62
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:102
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.ex:33
-#: lib/mv_web/live/user_live/index.html.heex:3
+#: lib/mv_web/live/user_live/index.ex
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Listing Users"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:60
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/member_live/index.ex:73
-#: lib/mv_web/live/member_live/index.html.heex:3
+#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/member_live/index.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:51
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:6
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Not set"
-msgstr ""
-
-#: lib/mv_web/live/user_live/form.ex:107
-#: lib/mv_web/live/user_live/form.ex:115
-#: lib/mv_web/live/user_live/form.ex:224
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr ""
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:95
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:63
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:68
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Select all members"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:82
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:35
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This is a user record from your database."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:128
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Unsupported value type: %{type}"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:42
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Use this form to manage user records in your database."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:266
-#: lib/mv_web/live/user_live/show.ex:34
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "User"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:92
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:56
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr ""
 
-#: lib/mv_web/components/table_components.ex:30
-#: lib/mv_web/live/components/sort_header_component.ex:57
+#: lib/mv_web/components/table_components.ex
+#: lib/mv_web/live/components/sort_header_component.ex
 #, elixir-autogen, elixir-format
 msgid "ascending"
 msgstr ""
 
-#: lib/mv_web/components/table_components.ex:30
-#: lib/mv_web/live/components/sort_header_component.ex:58
+#: lib/mv_web/components/table_components.ex
+#: lib/mv_web/live/components/sort_header_component.ex
 #, elixir-autogen, elixir-format
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:96
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Admin Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:96
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "As an administrator, you can directly set a new password for this user using the same secure Ash Authentication system."
 msgstr "As an administrator, you can directly set a new password for this user using the same secure Ash Authentication system."
 
-#: lib/mv_web/live/user_live/form.ex:87
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "At least 8 characters"
 msgstr "At least 8 characters"
 
-#: lib/mv_web/live/user_live/form.ex:59
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Change Password"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:107
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Check 'Change Password' above to set a new password for this user."
 msgstr "Check 'Change Password' above to set a new password for this user."
 
-#: lib/mv_web/live/user_live/form.ex:77
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Confirm Password"
 msgstr "Confirm Password"
 
-#: lib/mv_web/live/user_live/form.ex:89
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Consider using special characters"
 msgstr "Consider using special characters"
 
-#: lib/mv_web/live/user_live/form.ex:88
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Include both letters and numbers"
 msgstr "Include both letters and numbers"
 
-#: lib/mv_web/live/user_live/form.ex:67
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr "Password"
 
-#: lib/mv_web/live/user_live/form.ex:85
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Password requirements"
 msgstr "Password requirements"
 
-#: lib/mv_web/live/user_live/index.html.heex:21
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Select all users"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:35
+#: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Select user"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:59
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Set Password"
 msgstr "Set Password"
 
-#: lib/mv_web/live/user_live/form.ex:115
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 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/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/form.ex
+#: lib/mv_web/live/user_live/index.html.heex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Linked Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:62
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:72
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:36
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:38
-#: lib/mv_web/live/user_live/show.ex:40
+#: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Back to users list"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:33
-#: lib/mv_web/components/layouts/navbar.ex:39
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Select language"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:46
-#: lib/mv_web/components/layouts/navbar.ex:66
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr ""
 
-#: lib/mv_web/live/components/search_bar_component.ex:15
-#: lib/mv_web/live/member_live/index.html.heex:39
+#: lib/mv_web/live/components/search_bar_component.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Search..."
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:27
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Users"
 msgstr ""
 
-#: lib/mv_web/live/components/sort_header_component.ex:59
-#: lib/mv_web/live/components/sort_header_component.ex:63
+#: lib/mv_web/live/components/sort_header_component.ex
 #, elixir-autogen, elixir-format
 msgid "Click to sort"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:94
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "First name"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:167
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "An account with this email already exists. Please verify your password to link your OIDC account."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:77
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Unable to authenticate with OIDC. Please try again."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:152
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Unable to sign in. Please try again."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:92
-#: lib/mv_web/controllers/auth_controller.ex:97
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Authentication failed. Please try again."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:124
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "Cannot update email: This email is already registered to another account. Please change your email in the identity provider."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:130
+#: lib/mv_web/controllers/auth_controller.ex
 #, elixir-autogen, elixir-format
 msgid "This email is already linked to a different OIDC account. Cannot link multiple OIDC providers to the same account."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:53
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Choose a custom field"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:77
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Custom Field Values"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:51
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:117
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:242
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field value %{action} successfully"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:70
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Please select a custom field first"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:67
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:75
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save Custom field value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:46
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Use this form to manage custom_field records in your database."
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Custom Fields"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_value_live/form.ex:42
+#: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/show.ex:56
+#: lib/mv_web/live/custom_field_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Auto-generated identifier (immutable)"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:79
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:87
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:72
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:127
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:109
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:97
+#: lib/mv_web/live/custom_field_live/index.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "To confirm deletion, please enter this text:"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:64
+#: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:51
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Association Name"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:31
-#: lib/mv_web/live/global_settings_live.ex:41
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Club Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:43
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Manage global settings for the association."
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:56
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:75
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:224
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:192
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Available members"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:152
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Member will be unlinked when you save. Cannot select new member until saved."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:240
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save to confirm linking."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:171
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Search for a member to link..."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:175
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Search for member to link"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:237
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Selected"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:143
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Unlink Member"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:152
+#: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Unlinking scheduled"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/member_live/index.html.heex:10
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Copy email addresses of selected members"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:13
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Copy emails"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No members selected"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:23
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Open email program with BCC recipients"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex:26
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Open in email program"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:40
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Fields marked with an asterisk (*) cannot be empty."
 msgstr ""
 
-#: lib/mv_web/components/core_components.ex:206
-#: lib/mv_web/components/core_components.ex:223
-#: lib/mv_web/components/core_components.ex:250
-#: lib/mv_web/components/core_components.ex:277
+#: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This field cannot be empty"
 msgstr ""
 
-#: lib/mv_web/live/components/payment_filter_component.ex:80
-#: lib/mv_web/live/components/payment_filter_component.ex:143
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr ""
 
-#: lib/mv_web/live/components/payment_filter_component.ex:54
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "Filter by payment status"
 msgstr ""
 
-#: lib/mv_web/live/components/payment_filter_component.ex:108
-#: lib/mv_web/live/components/payment_filter_component.ex:145
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "Not paid"
 msgstr ""
 
-#: lib/mv_web/live/components/payment_filter_component.ex:65
+#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "Payment filter"
 msgstr ""
 
-#~ #: lib/mv_web/live/member_live/form.ex:48
-#~ #: lib/mv_web/live/member_live/show.ex:51
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Birth Date"
 #~ msgstr ""
+
+#~ #: lib/mv_web/live/user_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "ID"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/user_live/show.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Not set"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/user_live/index.html.heex
+#~ #: lib/mv_web/live/user_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "OIDC ID"
+#~ msgstr ""

From 483854ea65e65c8aa120e01e9d615a7e37cb074b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= <hello@rafa.ee>
Date: Tue, 2 Dec 2025 19:24:45 +0100
Subject: [PATCH 07/12] Move custom fields to global admin settings

---
 lib/mv_web/components/layouts/navbar.ex       |   2 +-
 lib/mv_web/live/custom_field_live/form.ex     | 142 ----------
 .../live/custom_field_live/form_component.ex  | 122 ++++++++
 lib/mv_web/live/custom_field_live/index.ex    | 199 -------------
 .../live/custom_field_live/index_component.ex | 259 +++++++++++++++++
 lib/mv_web/live/custom_field_live/show.ex     |  75 -----
 lib/mv_web/live/global_settings_live.ex       |  47 ++-
 lib/mv_web/router.ex                          |   6 -
 priv/gettext/de/LC_MESSAGES/default.po        | 258 ++++++++++-------
 priv/gettext/default.pot                      | 242 +++++++++-------
 priv/gettext/en/LC_MESSAGES/default.po        | 268 +++++++++++-------
 .../member_field_visibility_test.exs          |  14 -
 .../live/custom_field_live/deletion_test.exs  |  77 ++---
 test/mv_web/live/profile_navigation_test.exs  |   2 -
 14 files changed, 921 insertions(+), 792 deletions(-)
 delete mode 100644 lib/mv_web/live/custom_field_live/form.ex
 create mode 100644 lib/mv_web/live/custom_field_live/form_component.ex
 delete mode 100644 lib/mv_web/live/custom_field_live/index.ex
 create mode 100644 lib/mv_web/live/custom_field_live/index_component.ex
 delete mode 100644 lib/mv_web/live/custom_field_live/show.ex
 delete mode 100644 test/membership/member_field_visibility_test.exs

diff --git a/lib/mv_web/components/layouts/navbar.ex b/lib/mv_web/components/layouts/navbar.ex
index 7ff7f25..acbed90 100644
--- a/lib/mv_web/components/layouts/navbar.ex
+++ b/lib/mv_web/components/layouts/navbar.ex
@@ -23,7 +23,7 @@ defmodule MvWeb.Layouts.Navbar do
         <a class="btn btn-ghost text-xl">{@club_name}</a>
         <ul class="menu menu-horizontal bg-base-200">
           <li><.link navigate="/members">{gettext("Members")}</.link></li>
-          <li><.link navigate="/custom_fields">{gettext("Custom Fields")}</.link></li>
+          <li><.link navigate="/settings">{gettext("Settings")}</.link></li>
           <li><.link navigate="/users">{gettext("Users")}</.link></li>
         </ul>
       </div>
diff --git a/lib/mv_web/live/custom_field_live/form.ex b/lib/mv_web/live/custom_field_live/form.ex
deleted file mode 100644
index 99317a9..0000000
--- a/lib/mv_web/live/custom_field_live/form.ex
+++ /dev/null
@@ -1,142 +0,0 @@
-defmodule MvWeb.CustomFieldLive.Form do
-  @moduledoc """
-  LiveView form for creating and editing custom fields (admin).
-
-  ## Features
-  - Create new custom field definitions
-  - Edit existing custom fields
-  - Select value type from supported types
-  - Set immutable and required flags
-  - Real-time validation
-
-  ## Form Fields
-  **Required:**
-  - name - Unique identifier (e.g., "phone_mobile", "emergency_contact")
-  - value_type - Data type (:string, :integer, :boolean, :date, :email)
-
-  **Optional:**
-  - description - Human-readable explanation
-  - immutable - If true, values cannot be changed after creation (default: false)
-  - required - If true, all members must have this custom field (default: false)
-  - show_in_overview - If true, this custom field will be displayed in the member overview table (default: true)
-
-  ## Value Type Selection
-  - `:string` - Text data (unlimited length)
-  - `:integer` - Numeric data
-  - `:boolean` - True/false flags
-  - `:date` - Date values
-  - `:email` - Validated email addresses
-
-  ## Events
-  - `validate` - Real-time form validation
-  - `save` - Submit form (create or update custom field)
-
-  ## Security
-  Custom field management is restricted to admin users.
-  """
-  use MvWeb, :live_view
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <Layouts.app flash={@flash} current_user={@current_user}>
-      <.header>
-        {@page_title}
-        <:subtitle>
-          {gettext("Use this form to manage custom_field records in your database.")}
-        </:subtitle>
-      </.header>
-
-      <.form for={@form} id="custom_field-form" phx-change="validate" phx-submit="save">
-        <.input field={@form[:name]} type="text" label={gettext("Name")} />
-
-        <.input
-          field={@form[:value_type]}
-          type="select"
-          label={gettext("Value type")}
-          options={
-            Ash.Resource.Info.attribute(Mv.Membership.CustomField, :value_type).constraints[:one_of]
-          }
-        />
-        <.input field={@form[:description]} type="text" label={gettext("Description")} />
-        <.input field={@form[:immutable]} type="checkbox" label={gettext("Immutable")} />
-        <.input field={@form[:required]} type="checkbox" label={gettext("Required")} />
-        <.input field={@form[:show_in_overview]} type="checkbox" label={gettext("Show in overview")} />
-
-        <.button phx-disable-with={gettext("Saving...")} variant="primary">
-          {gettext("Save Custom field")}
-        </.button>
-        <.button navigate={return_path(@return_to, @custom_field)}>{gettext("Cancel")}</.button>
-      </.form>
-    </Layouts.app>
-    """
-  end
-
-  @impl true
-  def mount(params, _session, socket) do
-    custom_field =
-      case params["id"] do
-        nil -> nil
-        id -> Ash.get!(Mv.Membership.CustomField, id)
-      end
-
-    action = if is_nil(custom_field), do: "New", else: "Edit"
-    page_title = action <> " " <> "Custom field"
-
-    {:ok,
-     socket
-     |> assign(:return_to, return_to(params["return_to"]))
-     |> assign(custom_field: custom_field)
-     |> assign(:page_title, page_title)
-     |> assign_form()}
-  end
-
-  defp return_to("show"), do: "show"
-  defp return_to(_), do: "index"
-
-  @impl true
-  def handle_event("validate", %{"custom_field" => custom_field_params}, socket) do
-    {:noreply,
-     assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, custom_field_params))}
-  end
-
-  def handle_event("save", %{"custom_field" => custom_field_params}, socket) do
-    case AshPhoenix.Form.submit(socket.assigns.form, params: custom_field_params) do
-      {:ok, custom_field} ->
-        notify_parent({:saved, custom_field})
-
-        action =
-          case socket.assigns.form.source.type do
-            :create -> gettext("create")
-            :update -> gettext("update")
-            other -> to_string(other)
-          end
-
-        socket =
-          socket
-          |> put_flash(:info, gettext("Custom field %{action} successfully", action: action))
-          |> push_navigate(to: return_path(socket.assigns.return_to, custom_field))
-
-        {:noreply, socket}
-
-      {:error, form} ->
-        {:noreply, assign(socket, form: form)}
-    end
-  end
-
-  defp notify_parent(msg), do: send(self(), {__MODULE__, msg})
-
-  defp assign_form(%{assigns: %{custom_field: custom_field}} = socket) do
-    form =
-      if custom_field do
-        AshPhoenix.Form.for_update(custom_field, :update, as: "custom_field")
-      else
-        AshPhoenix.Form.for_create(Mv.Membership.CustomField, :create, as: "custom_field")
-      end
-
-    assign(socket, form: to_form(form))
-  end
-
-  defp return_path("index", _custom_field), do: ~p"/custom_fields"
-  defp return_path("show", custom_field), do: ~p"/custom_fields/#{custom_field.id}"
-end
diff --git a/lib/mv_web/live/custom_field_live/form_component.ex b/lib/mv_web/live/custom_field_live/form_component.ex
new file mode 100644
index 0000000..3c1b8d0
--- /dev/null
+++ b/lib/mv_web/live/custom_field_live/form_component.ex
@@ -0,0 +1,122 @@
+defmodule MvWeb.CustomFieldLive.FormComponent do
+  @moduledoc """
+  LiveComponent form for creating and editing custom fields (embedded in settings).
+
+  ## Features
+  - Create new custom field definitions
+  - Edit existing custom fields
+  - Select value type from supported types
+  - Set immutable and required flags
+  - Real-time validation
+
+  ## Props
+  - `custom_field` - The custom field to edit (nil for new)
+  - `on_save` - Callback function to call when form is saved
+  - `on_cancel` - Callback function to call when form is cancelled
+  """
+  use MvWeb, :live_component
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <div id={@id} class="mb-8 border shadow-xl card border-base-300">
+      <div class="card-body">
+        <div class="flex items-center gap-4 mb-4">
+          <.button type="button" phx-click="cancel" phx-target={@myself} aria-label={gettext("Back to custom field overview")}>
+            <.icon name="hero-arrow-left" class="w-4 h-4" />
+          </.button>
+          <h3 class="card-title">
+            {if @custom_field, do: gettext("Edit Custom Field"), else: gettext("New Custom Field")}
+          </h3>
+        </div>
+
+        <.form
+          for={@form}
+          id={@id <> "-form"}
+          phx-change="validate"
+          phx-submit="save"
+          phx-target={@myself}
+        >
+          <.input field={@form[:name]} type="text" label={gettext("Name")} />
+
+          <.input
+            field={@form[:value_type]}
+            type="select"
+            label={gettext("Value type")}
+            options={
+              Ash.Resource.Info.attribute(Mv.Membership.CustomField, :value_type).constraints[:one_of]
+            }
+          />
+          <.input field={@form[:description]} type="text" label={gettext("Description")} />
+          <.input field={@form[:immutable]} type="checkbox" label={gettext("Immutable")} />
+          <.input field={@form[:required]} type="checkbox" label={gettext("Required")} />
+          <.input
+            field={@form[:show_in_overview]}
+            type="checkbox"
+            label={gettext("Show in overview")}
+          />
+
+          <div class="justify-end mt-4 card-actions">
+            <.button type="button" phx-click="cancel" phx-target={@myself}>
+              {gettext("Cancel")}
+            </.button>
+            <.button phx-disable-with={gettext("Saving...")} variant="primary">
+              {gettext("Save Custom field")}
+            </.button>
+          </div>
+        </.form>
+      </div>
+    </div>
+    """
+  end
+
+  @impl true
+  def update(assigns, socket) do
+    {:ok,
+     socket
+     |> assign(assigns)
+     |> assign_form()}
+  end
+
+  @impl true
+  def handle_event("validate", %{"custom_field" => custom_field_params}, socket) do
+    {:noreply,
+     assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, custom_field_params))}
+  end
+
+  @impl true
+  def handle_event("save", %{"custom_field" => custom_field_params}, socket) do
+    case AshPhoenix.Form.submit(socket.assigns.form, params: custom_field_params) do
+      {:ok, custom_field} ->
+        action =
+          case socket.assigns.form.source.type do
+            :create -> gettext("create")
+            :update -> gettext("update")
+            other -> to_string(other)
+          end
+
+        socket.assigns.on_save.(custom_field, action)
+        {:noreply, socket}
+
+      {:error, form} ->
+        {:noreply, assign(socket, form: form)}
+    end
+  end
+
+  @impl true
+  def handle_event("cancel", _params, socket) do
+    socket.assigns.on_cancel.()
+    {:noreply, socket}
+  end
+
+  defp assign_form(%{assigns: %{custom_field: custom_field}} = socket) do
+    form =
+      if custom_field do
+        AshPhoenix.Form.for_update(custom_field, :update, as: "custom_field")
+      else
+        AshPhoenix.Form.for_create(Mv.Membership.CustomField, :create, as: "custom_field")
+      end
+
+    assign(socket, form: to_form(form))
+  end
+end
diff --git a/lib/mv_web/live/custom_field_live/index.ex b/lib/mv_web/live/custom_field_live/index.ex
deleted file mode 100644
index f711323..0000000
--- a/lib/mv_web/live/custom_field_live/index.ex
+++ /dev/null
@@ -1,199 +0,0 @@
-defmodule MvWeb.CustomFieldLive.Index do
-  @moduledoc """
-  LiveView for managing custom field definitions (admin).
-
-  ## Features
-  - List all custom fields
-  - Display type information (name, value type, description)
-  - Show immutable and required flags
-  - Create new custom fields
-  - Edit existing custom fields
-  - Delete custom fields with confirmation (cascades to all custom field values)
-
-  ## Displayed Information
-  - Name: Unique identifier for the custom field
-  - Value type: Data type constraint (string, integer, boolean, date, email)
-  - Description: Human-readable explanation
-  - Immutable: Whether custom field values can be changed after creation
-  - Required: Whether all members must have this custom field (future feature)
-
-  ## Events
-  - `prepare_delete` - Opens deletion confirmation modal with member count
-  - `confirm_delete` - Executes deletion after slug verification
-  - `cancel_delete` - Cancels deletion and closes modal
-  - `update_slug_confirmation` - Updates slug input state
-
-  ## Security
-  Custom field management is restricted to admin users.
-  Deletion requires entering the custom field's slug to prevent accidental deletions.
-  """
-  use MvWeb, :live_view
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <Layouts.app flash={@flash} current_user={@current_user}>
-      <.header>
-        Listing Custom fields
-        <:actions>
-          <.button variant="primary" navigate={~p"/custom_fields/new"}>
-            <.icon name="hero-plus" /> New Custom field
-          </.button>
-        </:actions>
-      </.header>
-
-      <.table
-        id="custom_fields"
-        rows={@streams.custom_fields}
-        row_click={fn {_id, custom_field} -> JS.navigate(~p"/custom_fields/#{custom_field}") end}
-      >
-        <:col :let={{_id, custom_field}} label="Name">{custom_field.name}</:col>
-
-        <:col :let={{_id, custom_field}} label="Description">{custom_field.description}</:col>
-
-        <:action :let={{_id, custom_field}}>
-          <div class="sr-only">
-            <.link navigate={~p"/custom_fields/#{custom_field}"}>Show</.link>
-          </div>
-
-          <.link navigate={~p"/custom_fields/#{custom_field}/edit"}>Edit</.link>
-        </:action>
-
-        <:action :let={{_id, custom_field}}>
-          <.link phx-click={JS.push("prepare_delete", value: %{id: custom_field.id})}>
-            Delete
-          </.link>
-        </:action>
-      </.table>
-
-      <%!-- Delete Confirmation Modal --%>
-      <dialog :if={@show_delete_modal} id="delete-custom-field-modal" class="modal modal-open">
-        <div class="modal-box">
-          <h3 class="font-bold text-lg">{gettext("Delete Custom Field")}</h3>
-
-          <div class="py-4 space-y-4">
-            <div class="alert alert-warning">
-              <.icon name="hero-exclamation-triangle" class="h-5 w-5" />
-              <div>
-                <p class="font-semibold">
-                  {ngettext(
-                    "%{count} member has a value assigned for this custom field.",
-                    "%{count} members have values assigned for this custom field.",
-                    @custom_field_to_delete.assigned_members_count,
-                    count: @custom_field_to_delete.assigned_members_count
-                  )}
-                </p>
-                <p class="text-sm mt-2">
-                  {gettext(
-                    "All custom field values will be permanently deleted when you delete this custom field."
-                  )}
-                </p>
-              </div>
-            </div>
-
-            <div>
-              <label for="slug-confirmation" class="label">
-                <span class="label-text">
-                  {gettext("To confirm deletion, please enter this text:")}
-                </span>
-              </label>
-              <div class="font-mono font-bold text-lg mb-2 p-2 bg-base-200 rounded break-all">
-                {@custom_field_to_delete.slug}
-              </div>
-              <form phx-change="update_slug_confirmation">
-                <input
-                  id="slug-confirmation"
-                  name="slug"
-                  type="text"
-                  value={@slug_confirmation}
-                  placeholder={gettext("Enter the text above to confirm")}
-                  autocomplete="off"
-                  phx-mounted={JS.focus()}
-                  class="input input-bordered w-full"
-                />
-              </form>
-            </div>
-          </div>
-
-          <div class="modal-action">
-            <button phx-click="cancel_delete" class="btn">
-              {gettext("Cancel")}
-            </button>
-            <button
-              phx-click="confirm_delete"
-              class="btn btn-error"
-              disabled={@slug_confirmation != @custom_field_to_delete.slug}
-            >
-              {gettext("Delete Custom Field and All Values")}
-            </button>
-          </div>
-        </div>
-      </dialog>
-    </Layouts.app>
-    """
-  end
-
-  @impl true
-  def mount(_params, _session, socket) do
-    {:ok,
-     socket
-     |> assign(:page_title, "Listing Custom fields")
-     |> assign(:show_delete_modal, false)
-     |> assign(:custom_field_to_delete, nil)
-     |> assign(:slug_confirmation, "")
-     |> stream(:custom_fields, Ash.read!(Mv.Membership.CustomField))}
-  end
-
-  @impl true
-  def handle_event("prepare_delete", %{"id" => id}, socket) do
-    custom_field = Ash.get!(Mv.Membership.CustomField, id, load: [:assigned_members_count])
-
-    {:noreply,
-     socket
-     |> assign(:custom_field_to_delete, custom_field)
-     |> assign(:show_delete_modal, true)
-     |> assign(:slug_confirmation, "")}
-  end
-
-  @impl true
-  def handle_event("update_slug_confirmation", %{"slug" => slug}, socket) do
-    {:noreply, assign(socket, :slug_confirmation, slug)}
-  end
-
-  @impl true
-  def handle_event("confirm_delete", _params, socket) do
-    custom_field = socket.assigns.custom_field_to_delete
-
-    if socket.assigns.slug_confirmation == custom_field.slug do
-      # Delete the custom field (CASCADE will handle custom field values)
-      case Ash.destroy(custom_field) do
-        :ok ->
-          {:noreply,
-           socket
-           |> put_flash(:info, "Custom field deleted successfully")
-           |> assign(:show_delete_modal, false)
-           |> assign(:custom_field_to_delete, nil)
-           |> assign(:slug_confirmation, "")
-           |> stream_delete(:custom_fields, custom_field)}
-
-        {:error, error} ->
-          {:noreply,
-           socket
-           |> put_flash(:error, "Failed to delete custom field: #{inspect(error)}")}
-      end
-    else
-      {:noreply,
-       socket
-       |> put_flash(:error, "Slug does not match. Deletion cancelled.")}
-    end
-  end
-
-  @impl true
-  def handle_event("cancel_delete", _params, socket) do
-    {:noreply,
-     socket
-     |> assign(:show_delete_modal, false)
-     |> assign(:custom_field_to_delete, nil)
-     |> assign(:slug_confirmation, "")}
-  end
-end
diff --git a/lib/mv_web/live/custom_field_live/index_component.ex b/lib/mv_web/live/custom_field_live/index_component.ex
new file mode 100644
index 0000000..9b8ff0d
--- /dev/null
+++ b/lib/mv_web/live/custom_field_live/index_component.ex
@@ -0,0 +1,259 @@
+defmodule MvWeb.CustomFieldLive.IndexComponent do
+  @moduledoc """
+  LiveComponent for managing custom field definitions (embedded in settings).
+
+  ## Features
+  - List all custom fields
+  - Display type information (name, value type, description)
+  - Show immutable and required flags
+  - Create new custom fields
+  - Edit existing custom fields
+  - Delete custom fields with confirmation (cascades to all custom field values)
+  """
+  use MvWeb, :live_component
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <div id={@id}>
+      <.header>
+        {gettext("Custom Fields")}
+        <:subtitle>
+          {gettext("These will appear in addition to other data when adding new members.")}
+        </:subtitle>
+        <:actions>
+          <.button variant="primary" phx-click="new_custom_field" phx-target={@myself}>
+            <.icon name="hero-plus" /> {gettext("New Custom field")}
+          </.button>
+        </:actions>
+      </.header>
+
+      <%!-- Show form when creating or editing --%>
+      <div :if={@show_form} class="mb-8">
+        <.live_component
+          module={MvWeb.CustomFieldLive.FormComponent}
+          id={@form_id}
+          custom_field={@editing_custom_field}
+          on_save={fn custom_field, action -> send(self(), {:custom_field_saved, custom_field, action}) end}
+          on_cancel={fn -> send_update(__MODULE__, id: @id, show_form: false) end}
+        />
+      </div>
+
+      <%!-- Hide table when form is visible --%>
+      <.table
+        :if={!@show_form}
+        id="custom_fields"
+        rows={@streams.custom_fields}
+        row_click={
+          fn {_id, custom_field} ->
+            JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself)
+          end
+        }
+      >
+        <:col :let={{_id, custom_field}} label={gettext("Name")}>{custom_field.name}</:col>
+
+        <:col :let={{_id, custom_field}} label={gettext("Value Type")}>
+          {custom_field.value_type}
+        </:col>
+
+        <:col :let={{_id, custom_field}} label={gettext("Description")}>
+          {custom_field.description}
+        </:col>
+
+        <:col :let={{_id, custom_field}} label={gettext("Show in Overview")}>
+          <span :if={custom_field.show_in_overview} class="badge badge-success">
+            {gettext("Yes")}
+          </span>
+          <span :if={!custom_field.show_in_overview} class="badge badge-ghost">
+            {gettext("No")}
+          </span>
+        </:col>
+
+        <:action :let={{_id, custom_field}}>
+          <.link phx-click={
+            JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself)
+          }>
+            {gettext("Edit")}
+          </.link>
+        </:action>
+
+        <:action :let={{_id, custom_field}}>
+          <.link phx-click={JS.push("prepare_delete", value: %{id: custom_field.id}, target: @myself)}>
+            {gettext("Delete")}
+          </.link>
+        </:action>
+      </.table>
+
+      <%!-- Delete Confirmation Modal --%>
+      <dialog :if={@show_delete_modal} id="delete-custom-field-modal" class="modal modal-open">
+        <div class="modal-box">
+          <h3 class="text-lg font-bold">{gettext("Delete Custom Field")}</h3>
+
+          <div class="py-4 space-y-4">
+            <div class="alert alert-warning">
+              <.icon name="hero-exclamation-triangle" class="w-5 h-5" />
+              <div>
+                <p class="font-semibold">
+                  {ngettext(
+                    "%{count} member has a value assigned for this custom field.",
+                    "%{count} members have values assigned for this custom field.",
+                    @custom_field_to_delete.assigned_members_count,
+                    count: @custom_field_to_delete.assigned_members_count
+                  )}
+                </p>
+                <p class="mt-2 text-sm">
+                  {gettext(
+                    "All custom field values will be permanently deleted when you delete this custom field."
+                  )}
+                </p>
+              </div>
+            </div>
+
+            <div>
+              <label for="slug-confirmation" class="label">
+                <span class="label-text">
+                  {gettext("To confirm deletion, please enter this text:")}
+                </span>
+              </label>
+              <div class="p-2 mb-2 font-mono text-lg font-bold break-all rounded bg-base-200">
+                {@custom_field_to_delete.slug}
+              </div>
+              <form phx-change="update_slug_confirmation" phx-target={@myself}>
+                <input
+                  id="slug-confirmation"
+                  name="slug"
+                  type="text"
+                  value={@slug_confirmation}
+                  placeholder={gettext("Enter the text above to confirm")}
+                  autocomplete="off"
+                  phx-mounted={JS.focus()}
+                  class="w-full input input-bordered"
+                />
+              </form>
+            </div>
+          </div>
+
+          <div class="modal-action">
+            <button phx-click="cancel_delete" phx-target={@myself} class="btn">
+              {gettext("Cancel")}
+            </button>
+            <button
+              phx-click="confirm_delete"
+              phx-target={@myself}
+              class="btn btn-error"
+              disabled={@slug_confirmation != @custom_field_to_delete.slug}
+            >
+              {gettext("Delete Custom Field and All Values")}
+            </button>
+          </div>
+        </div>
+      </dialog>
+    </div>
+    """
+  end
+
+  @impl true
+  def update(assigns, socket) do
+    # If show_form is explicitly provided in assigns, reset editing state
+    socket =
+      if Map.has_key?(assigns, :show_form) and assigns.show_form == false do
+        socket
+        |> assign(:editing_custom_field, nil)
+        |> assign(:form_id, "custom-field-form-new")
+      else
+        socket
+      end
+
+    {:ok,
+     socket
+     |> assign(assigns)
+     |> assign_new(:show_form, fn -> false end)
+     |> assign_new(:form_id, fn -> "custom-field-form-new" end)
+     |> assign_new(:editing_custom_field, fn -> nil end)
+     |> assign_new(:show_delete_modal, fn -> false end)
+     |> assign_new(:custom_field_to_delete, fn -> nil end)
+     |> assign_new(:slug_confirmation, fn -> "" end)
+     |> stream(:custom_fields, Ash.read!(Mv.Membership.CustomField), reset: true)}
+  end
+
+  @impl true
+  def handle_event("new_custom_field", _params, socket) do
+    {:noreply,
+     socket
+     |> assign(:show_form, true)
+     |> assign(:editing_custom_field, nil)
+     |> assign(:form_id, "custom-field-form-new")}
+  end
+
+  @impl true
+  def handle_event("edit_custom_field", %{"id" => id}, socket) do
+    custom_field = Ash.get!(Mv.Membership.CustomField, id)
+
+    {:noreply,
+     socket
+     |> assign(:show_form, true)
+     |> assign(:editing_custom_field, custom_field)
+     |> assign(:form_id, "custom-field-form-#{id}")}
+  end
+
+  @impl true
+  def handle_event("prepare_delete", %{"id" => id}, socket) do
+    custom_field = Ash.get!(Mv.Membership.CustomField, id, load: [:assigned_members_count])
+
+    {:noreply,
+     socket
+     |> assign(:custom_field_to_delete, custom_field)
+     |> assign(:show_delete_modal, true)
+     |> assign(:slug_confirmation, "")}
+  end
+
+  @impl true
+  def handle_event("update_slug_confirmation", %{"slug" => slug}, socket) do
+    {:noreply, assign(socket, :slug_confirmation, slug)}
+  end
+
+  @impl true
+  def handle_event("confirm_delete", _params, socket) do
+    custom_field = socket.assigns.custom_field_to_delete
+
+    if socket.assigns.slug_confirmation == custom_field.slug do
+      case Ash.destroy(custom_field) do
+        :ok ->
+          send(self(), {:custom_field_deleted, custom_field})
+
+          {:noreply,
+           socket
+           |> assign(:show_delete_modal, false)
+           |> assign(:custom_field_to_delete, nil)
+           |> assign(:slug_confirmation, "")
+           |> stream_delete(:custom_fields, custom_field)}
+
+        {:error, error} ->
+          send(self(), {:custom_field_delete_error, error})
+
+          {:noreply,
+           socket
+           |> assign(:show_delete_modal, false)
+           |> assign(:custom_field_to_delete, nil)
+           |> assign(:slug_confirmation, "")}
+      end
+    else
+      send(self(), :custom_field_slug_mismatch)
+
+      {:noreply,
+       socket
+       |> assign(:show_delete_modal, false)
+       |> assign(:custom_field_to_delete, nil)
+       |> assign(:slug_confirmation, "")}
+    end
+  end
+
+  @impl true
+  def handle_event("cancel_delete", _params, socket) do
+    {:noreply,
+     socket
+     |> assign(:show_delete_modal, false)
+     |> assign(:custom_field_to_delete, nil)
+     |> assign(:slug_confirmation, "")}
+  end
+end
diff --git a/lib/mv_web/live/custom_field_live/show.ex b/lib/mv_web/live/custom_field_live/show.ex
deleted file mode 100644
index 239b844..0000000
--- a/lib/mv_web/live/custom_field_live/show.ex
+++ /dev/null
@@ -1,75 +0,0 @@
-defmodule MvWeb.CustomFieldLive.Show do
-  @moduledoc """
-  LiveView for displaying a single custom field's details (admin).
-
-  ## Features
-  - Display custom field definition
-  - Show all attributes (name, value type, description, flags)
-  - Navigate to edit form
-  - Return to custom field list
-
-  ## Displayed Information
-  - ID: Internal UUID identifier
-  - Slug: URL-friendly identifier (auto-generated, immutable)
-  - Name: Unique identifier
-  - Value type: Data type constraint
-  - Description: Optional explanation
-  - Immutable flag: Whether values can be changed
-  - Required flag: Whether all members need this custom field
-
-  ## Navigation
-  - Back to custom field list
-  - Edit custom field
-
-  ## Security
-  Custom field details are restricted to admin users.
-  """
-  use MvWeb, :live_view
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <Layouts.app flash={@flash} current_user={@current_user}>
-      <.header>
-        Custom field {@custom_field.slug}
-        <:subtitle>This is a custom_field record from your database.</:subtitle>
-
-        <:actions>
-          <.button navigate={~p"/custom_fields"}>
-            <.icon name="hero-arrow-left" />
-          </.button>
-          <.button
-            variant="primary"
-            navigate={~p"/custom_fields/#{@custom_field}/edit?return_to=show"}
-          >
-            <.icon name="hero-pencil-square" /> Edit Custom field
-          </.button>
-        </:actions>
-      </.header>
-
-      <.list>
-        <:item title="Id">{@custom_field.id}</:item>
-
-        <:item title="Slug">
-          {@custom_field.slug}
-          <p class="mt-2 text-sm leading-6 text-zinc-600">
-            {gettext("Auto-generated identifier (immutable)")}
-          </p>
-        </:item>
-
-        <:item title="Name">{@custom_field.name}</:item>
-
-        <:item title="Description">{@custom_field.description}</:item>
-      </.list>
-    </Layouts.app>
-    """
-  end
-
-  @impl true
-  def mount(%{"id" => id}, _session, socket) do
-    {:ok,
-     socket
-     |> assign(:page_title, "Show Custom field")
-     |> assign(:custom_field, Ash.get!(Mv.Membership.CustomField, id))}
-  end
-end
diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex
index 0be4559..bb919cb 100644
--- a/lib/mv_web/live/global_settings_live.ex
+++ b/lib/mv_web/live/global_settings_live.ex
@@ -4,6 +4,7 @@ defmodule MvWeb.GlobalSettingsLive do
 
   ## Features
   - Edit the association/club name
+  - Manage custom fields
   - Real-time form validation
   - Success/error feedback
 
@@ -28,7 +29,7 @@ defmodule MvWeb.GlobalSettingsLive do
 
     {:ok,
      socket
-     |> assign(:page_title, gettext("Club Settings"))
+     |> assign(:page_title, gettext("Settings"))
      |> assign(:settings, settings)
      |> assign_form()}
   end
@@ -38,12 +39,16 @@ defmodule MvWeb.GlobalSettingsLive do
     ~H"""
     <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
-        {gettext("Club Settings")}
+        {gettext("Settings")}
         <:subtitle>
           {gettext("Manage global settings for the association.")}
         </:subtitle>
       </.header>
 
+      <%!-- Club Settings Section --%>
+      <.header>
+        {gettext("Club Settings")}
+      </.header>
       <.form for={@form} id="settings-form" phx-change="validate" phx-submit="save">
         <.input
           field={@form[:club_name]}
@@ -56,6 +61,12 @@ defmodule MvWeb.GlobalSettingsLive do
           {gettext("Save Settings")}
         </.button>
       </.form>
+
+      <%!-- Custom Fields Section --%>
+      <.live_component
+        module={MvWeb.CustomFieldLive.IndexComponent}
+        id="custom-fields-component"
+      />
     </Layouts.app>
     """
   end
@@ -66,6 +77,7 @@ defmodule MvWeb.GlobalSettingsLive do
      assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, setting_params))}
   end
 
+  @impl true
   def handle_event("save", %{"setting" => setting_params}, socket) do
     case AshPhoenix.Form.submit(socket.assigns.form, params: setting_params) do
       {:ok, updated_settings} ->
@@ -82,6 +94,37 @@ defmodule MvWeb.GlobalSettingsLive do
     end
   end
 
+  @impl true
+  def handle_info({:custom_field_saved, _custom_field, action}, socket) do
+    send_update(MvWeb.CustomFieldLive.IndexComponent,
+      id: "custom-fields-component",
+      show_form: false
+    )
+
+    {:noreply,
+     put_flash(socket, :info, gettext("Custom field %{action} successfully", action: action))}
+  end
+
+  @impl true
+  def handle_info({:custom_field_deleted, _custom_field}, socket) do
+    {:noreply, put_flash(socket, :info, gettext("Custom field deleted successfully"))}
+  end
+
+  @impl true
+  def handle_info({:custom_field_delete_error, error}, socket) do
+    {:noreply,
+     put_flash(
+       socket,
+       :error,
+       gettext("Failed to delete custom field: %{error}", error: inspect(error))
+     )}
+  end
+
+  @impl true
+  def handle_info(:custom_field_slug_mismatch, socket) do
+    {:noreply, put_flash(socket, :error, gettext("Slug does not match. Deletion cancelled."))}
+  end
+
   defp assign_form(%{assigns: %{settings: settings}} = socket) do
     form =
       AshPhoenix.Form.for_update(
diff --git a/lib/mv_web/router.ex b/lib/mv_web/router.ex
index 09a2792..8b1b0e6 100644
--- a/lib/mv_web/router.ex
+++ b/lib/mv_web/router.ex
@@ -55,12 +55,6 @@ defmodule MvWeb.Router do
       live "/members/:id", MemberLive.Show, :show
       live "/members/:id/show/edit", MemberLive.Show, :edit
 
-      live "/custom_fields", CustomFieldLive.Index, :index
-      live "/custom_fields/new", CustomFieldLive.Form, :new
-      live "/custom_fields/:id/edit", CustomFieldLive.Form, :edit
-      live "/custom_fields/:id", CustomFieldLive.Show, :show
-      live "/custom_fields/:id/show/edit", CustomFieldLive.Show, :edit
-
       live "/custom_field_values", CustomFieldValueLive.Index, :index
       live "/custom_field_values/new", CustomFieldValueLive.Form, :new
       live "/custom_field_values/:id/edit", CustomFieldValueLive.Form, :edit
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 66bcec1..9abe609 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex:387
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr "Aktionen"
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/user_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr "Bist du sicher?"
@@ -29,55 +29,57 @@ msgstr "Verbindung wird wiederhergestellt"
 
 #: lib/mv_web/live/member_live/form.ex:53
 #: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/show.ex:59
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr "Stadt"
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:82
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/user_live/index.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr "Löschen"
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:76
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/user_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: lib/mv_web/live/member_live/show.ex:41
-#: lib/mv_web/live/member_live/show.ex:116
+#: lib/mv_web/live/member_live/show.ex:42
+#: lib/mv_web/live/member_live/show.ex:114
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr "Mitglied bearbeiten"
 
 #: lib/mv_web/live/member_live/form.ex:47
 #: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/show.ex:51
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr "E-Mail"
 
 #: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:48
+#: lib/mv_web/live/member_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr "Vorname"
 
 #: lib/mv_web/live/member_live/form.ex:50
 #: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr "Beitrittsdatum"
 
 #: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr "Nachname"
@@ -88,7 +90,7 @@ msgid "New Member"
 msgstr "Neues Mitglied"
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/user_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr "Anzeigen"
@@ -109,20 +111,20 @@ msgid "close"
 msgstr "schließen"
 
 #: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/show.ex:57
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr "Austrittsdatum"
 
 #: lib/mv_web/live/member_live/form.ex:55
 #: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:60
+#: lib/mv_web/live/member_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr "Hausnummer"
 
 #: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/show.ex:58
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Notizen"
@@ -131,21 +133,21 @@ msgstr "Notizen"
 #: lib/mv_web/live/components/payment_filter_component.ex:144
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/member_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr "Bezahlt"
 
 #: lib/mv_web/live/member_live/form.ex:49
 #: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:54
+#: lib/mv_web/live/member_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #: lib/mv_web/live/member_live/form.ex:56
 #: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:61
+#: lib/mv_web/live/member_live/show.ex:62
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr "Postleitzahl"
@@ -155,59 +157,61 @@ msgstr "Postleitzahl"
 msgid "Save Member"
 msgstr "Mitglied speichern"
 
-#: lib/mv_web/live/custom_field_live/form.ex:66
+#: lib/mv_web/live/custom_field_live/form_component.ex:63
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
-#: lib/mv_web/live/global_settings_live.ex:55
+#: lib/mv_web/live/global_settings_live.ex:60
 #: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Speichern..."
 
 #: lib/mv_web/live/member_live/form.ex:54
 #: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:59
+#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr "Straße"
 
-#: lib/mv_web/live/member_live/show.ex:47
+#: lib/mv_web/live/member_live/show.ex:48
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr "ID"
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:68
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:62
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr "Nein"
 
-#: lib/mv_web/live/member_live/show.ex:115
+#: lib/mv_web/live/member_live/show.ex:113
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr "Mitglied anzeigen"
 
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "This is a member record from your database."
 msgstr "Dies ist ein Mitglied aus deiner Datenbank."
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:65
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/mv_web/live/custom_field_live/form.ex:110
+#: lib/mv_web/live/custom_field_live/form_component.ex:93
 #: lib/mv_web/live/custom_field_value_live/form.ex:233
 #: lib/mv_web/live/member_live/form.ex:137
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr "erstellt"
 
-#: lib/mv_web/live/custom_field_live/form.ex:111
+#: lib/mv_web/live/custom_field_live/form_component.ex:94
 #: lib/mv_web/live/custom_field_value_live/form.ex:234
 #: lib/mv_web/live/member_live/form.ex:138
 #, elixir-autogen, elixir-format
@@ -249,11 +253,11 @@ msgstr "Ihre E-Mail-Adresse wurde bestätigt"
 msgid "Your password has successfully been reset"
 msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt"
 
-#: lib/mv_web/live/custom_field_live/form.ex:69
-#: lib/mv_web/live/custom_field_live/index.ex:120
+#: lib/mv_web/live/custom_field_live/form_component.ex:61
+#: lib/mv_web/live/custom_field_live/index_component.ex:138
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/user_live/form.ex:252
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -263,7 +267,8 @@ msgstr "Abbrechen"
 msgid "Choose a member"
 msgstr "Mitglied auswählen"
 
-#: lib/mv_web/live/custom_field_live/form.ex:61
+#: lib/mv_web/live/custom_field_live/form_component.ex:50
+#: lib/mv_web/live/custom_field_live/index_component.ex:59
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Beschreibung"
@@ -273,17 +278,12 @@ msgstr "Beschreibung"
 msgid "Edit User"
 msgstr "Benutzer*in bearbeiten"
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr "ID"
-
-#: lib/mv_web/live/custom_field_live/form.ex:62
+#: lib/mv_web/live/custom_field_live/form_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr "Unveränderlich"
@@ -305,13 +305,14 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/member_live/index.ex:73
+#: lib/mv_web/live/member_live/index.ex:74
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr "Mitglieder"
 
-#: lib/mv_web/live/custom_field_live/form.ex:51
+#: lib/mv_web/live/custom_field_live/form_component.ex:40
+#: lib/mv_web/live/custom_field_live/index_component.ex:53
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr "Name"
@@ -321,16 +322,11 @@ msgstr "Name"
 msgid "New User"
 msgstr "Neue*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr "Nicht aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "Not set"
-msgstr "Nicht gesetzt"
-
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -338,13 +334,7 @@ msgstr "Nicht gesetzt"
 msgid "Note"
 msgstr "Hinweis"
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr "OIDC ID"
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr "Passwort-Authentifizierung"
@@ -354,7 +344,7 @@ msgstr "Passwort-Authentifizierung"
 msgid "Profil"
 msgstr "Profil"
 
-#: lib/mv_web/live/custom_field_live/form.ex:63
+#: lib/mv_web/live/custom_field_live/form_component.ex:52
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr "Erforderlich"
@@ -369,17 +359,20 @@ msgstr "Alle Mitglieder auswählen"
 msgid "Select member"
 msgstr "Mitglied auswählen"
 
+#: lib/mv_web/components/layouts/navbar.ex:26
 #: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/live/global_settings_live.ex:32
+#: lib/mv_web/live/global_settings_live.ex:42
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex:250
 #, elixir-autogen, elixir-format
 msgid "Save User"
 msgstr "Benutzer*in speichern"
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr "Benutzer*in anzeigen"
@@ -399,7 +392,7 @@ msgstr "Nicht unterstützter Wertetyp: %{type}"
 msgid "Use this form to manage user records in your database."
 msgstr "Verwenden Sie dieses Formular, um Benutzer*innen-Datensätze zu verwalten."
 
-#: lib/mv_web/live/user_live/form.ex:266
+#: lib/mv_web/live/user_live/form.ex:268
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -410,7 +403,7 @@ msgstr "Benutzer*in"
 msgid "Value"
 msgstr "Wert"
 
-#: lib/mv_web/live/custom_field_live/form.ex:56
+#: lib/mv_web/live/custom_field_live/form_component.ex:45
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr "Wertetyp"
@@ -427,7 +420,7 @@ msgstr "aufsteigend"
 msgid "descending"
 msgstr "absteigend"
 
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex:267
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr "Neue*r"
@@ -503,30 +496,30 @@ msgid "User will be created without a password. Check 'Set Password' to add one.
 msgstr "Benutzer*in wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen."
 
 #: lib/mv_web/live/user_live/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr "Verknüpftes Mitglied"
 
-#: lib/mv_web/live/member_live/show.ex:62
+#: lib/mv_web/live/member_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr "Verknüpfte*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex:56
+#: lib/mv_web/live/user_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr "Kein Mitglied verknüpft"
 
-#: lib/mv_web/live/member_live/show.ex:72
+#: lib/mv_web/live/member_live/show.ex:73
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr "Keine*r Benutzer*in verknüpft"
 
-#: lib/mv_web/live/member_live/show.ex:36
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex:37
+#: lib/mv_web/live/member_live/show.ex:39
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr "Zurück zur Mitgliederliste"
@@ -608,7 +601,7 @@ msgid "Choose a custom field"
 msgstr "Wähle ein Benutzerdefiniertes Feld"
 
 #: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:77
+#: lib/mv_web/live/member_live/show.ex:78
 #, elixir-autogen, elixir-format
 msgid "Custom Field Values"
 msgstr "Benutzerdefinierte Feldwerte"
@@ -618,7 +611,7 @@ msgstr "Benutzerdefinierte Feldwerte"
 msgid "Custom field"
 msgstr "Benutzerdefiniertes Feld"
 
-#: lib/mv_web/live/custom_field_live/form.ex:117
+#: lib/mv_web/live/global_settings_live.ex:105
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr "Benutzerdefiniertes Feld erfolgreich %{action}"
@@ -633,7 +626,7 @@ msgstr "Benutzerdefinierter Feldwert erfolgreich %{action}"
 msgid "Please select a custom field first"
 msgstr "Bitte wähle zuerst ein Benutzerdefiniertes Feld"
 
-#: lib/mv_web/live/custom_field_live/form.ex:67
+#: lib/mv_web/live/custom_field_live/form_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr "Benutzerdefiniertes Feld speichern"
@@ -643,12 +636,7 @@ msgstr "Benutzerdefiniertes Feld speichern"
 msgid "Save Custom field value"
 msgstr "Benutzerdefinierten Feldwert speichern"
 
-#: lib/mv_web/live/custom_field_live/form.ex:46
-#, elixir-autogen, elixir-format
-msgid "Use this form to manage custom_field records in your database."
-msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten."
-
-#: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/live/custom_field_live/index_component.ex:20
 #, elixir-autogen, elixir-format
 msgid "Custom Fields"
 msgstr "Benutzerdefinierte Felder"
@@ -658,70 +646,64 @@ msgstr "Benutzerdefinierte Felder"
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr "Verwende dieses Formular, um Benutzerdefinierte Feldwerte in deiner Datenbank zu verwalten."
 
-#: lib/mv_web/live/custom_field_live/show.ex:56
-#, elixir-autogen, elixir-format
-msgid "Auto-generated identifier (immutable)"
-msgstr "Automatisch generierter Bezeichner (unveränderlich)"
-
-#: lib/mv_web/live/custom_field_live/index.ex:79
+#: lib/mv_web/live/custom_field_live/index_component.ex:97
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] "%{count} Mitglied hat einen Wert für dieses benutzerdefinierte Feld zugewiesen."
 msgstr[1] "%{count} Mitglieder haben Werte für dieses benutzerdefinierte Feld zugewiesen."
 
-#: lib/mv_web/live/custom_field_live/index.ex:87
+#: lib/mv_web/live/custom_field_live/index_component.ex:105
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr "Alle benutzerdefinierten Feldwerte werden beim Löschen dieses benutzerdefinierten Feldes dauerhaft gelöscht."
 
-#: lib/mv_web/live/custom_field_live/index.ex:72
+#: lib/mv_web/live/custom_field_live/index_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr "Benutzerdefiniertes Feld löschen"
 
-#: lib/mv_web/live/custom_field_live/index.ex:127
+#: lib/mv_web/live/custom_field_live/index_component.ex:146
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr "Benutzerdefiniertes Feld und alle Werte löschen"
 
-#: lib/mv_web/live/custom_field_live/index.ex:109
+#: lib/mv_web/live/custom_field_live/index_component.ex:127
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr "Obigen Text zur Bestätigung eingeben"
 
-#: lib/mv_web/live/custom_field_live/index.ex:97
+#: lib/mv_web/live/custom_field_live/index_component.ex:115
 #, elixir-autogen, elixir-format, fuzzy
 msgid "To confirm deletion, please enter this text:"
 msgstr "Um die Löschung zu bestätigen, gib bitte folgenden Text ein:"
 
-#: lib/mv_web/live/custom_field_live/form.ex:64
+#: lib/mv_web/live/custom_field_live/form_component.ex:56
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr "In der Mitglieder-Übersicht anzeigen"
 
-#: lib/mv_web/live/global_settings_live.ex:51
+#: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format
 msgid "Association Name"
 msgstr "Vereinsname"
 
-#: lib/mv_web/live/global_settings_live.ex:31
-#: lib/mv_web/live/global_settings_live.ex:41
+#: lib/mv_web/live/global_settings_live.ex:50
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Club Settings"
 msgstr "Vereinsdaten"
 
-#: lib/mv_web/live/global_settings_live.ex:43
+#: lib/mv_web/live/global_settings_live.ex:44
 #, elixir-autogen, elixir-format
 msgid "Manage global settings for the association."
 msgstr "Passe übergreifende Einstellungen für den Verein an."
 
-#: lib/mv_web/live/global_settings_live.ex:56
+#: lib/mv_web/live/global_settings_live.ex:61
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: lib/mv_web/live/global_settings_live.ex:75
+#: lib/mv_web/live/global_settings_live.ex:87
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
 msgstr "Einstellungen erfolgreich gespeichert"
@@ -736,7 +718,7 @@ msgstr "Ein Mitglied mit dieser E-Mail-Adresse existiert bereits. Um mit einem a
 msgid "Available members"
 msgstr "Verfügbare Mitglieder"
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex:359
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr "Fehler beim Verlinken des Mitglieds: %{error}"
@@ -776,7 +758,7 @@ msgstr "Mitglied entverknüpfen"
 msgid "Unlinking scheduled"
 msgstr "Entverknüpfung geplant"
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex:160
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -793,12 +775,12 @@ msgstr "E-Mail-Adressen der ausgewählten Mitglieder kopieren"
 msgid "Copy emails"
 msgstr "E-Mails kopieren"
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex:149
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr "Keine E-Mail-Adressen gefunden"
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex:146
 #, elixir-autogen, elixir-format
 msgid "No members selected"
 msgstr "Keine Mitglieder ausgewählt"
@@ -813,7 +795,7 @@ msgstr "E-Mail-Programm mit BCC-Empfänger*innen öffnen"
 msgid "Open in email program"
 msgstr "Im E-Mail-Programm öffnen"
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex:169
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr "Tipp: E-Mail-Adressen ins BCC-Feld einfügen für Datenschutzkonformität"
@@ -853,8 +835,74 @@ msgstr "Nicht bezahlt"
 msgid "Payment filter"
 msgstr "Zahlungsfilter"
 
+#: lib/mv_web/live/global_settings_live.ex:110
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Custom field deleted successfully"
+msgstr "Benutzerdefiniertes Feld erfolgreich %{action}"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Edit Custom Field"
+msgstr "Benutzerdefiniertes Feld bearbeiten"
+
+#: lib/mv_web/live/global_settings_live.ex:119
+#, elixir-autogen, elixir-format
+msgid "Failed to delete custom field: %{error}"
+msgstr "Konnte benutzerdefiniertes Feld nicht löschen: %{error}"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom Field"
+msgstr "Neues Benutzerdefiniertes Feld"
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:26
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom field"
+msgstr "Neues Benutzerdefiniertes Feld"
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:63
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Show in Overview"
+msgstr "In der Mitglieder-Übersicht anzeigen"
+
+#: lib/mv_web/live/global_settings_live.ex:125
+#, elixir-autogen, elixir-format
+msgid "Slug does not match. Deletion cancelled."
+msgstr "Eingegebener Text war nicht korrekt. Löschen wurde abgebrochen."
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:55
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Value Type"
+msgstr "Wertetyp"
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:22
+#, elixir-autogen, elixir-format
+msgid "These will appear in addition to other data when adding new members."
+msgstr "Diese Felder können zusätzlich zu den normalen Daten ausgefüllt werden, wenn ein neues Mitglied angelegt wird."
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:25
+#, elixir-autogen, elixir-format
+msgid "Back to custom field overview"
+msgstr "Zurück zur Felderliste"
+
 #~ #: lib/mv_web/live/member_live/form.ex:48
 #~ #: lib/mv_web/live/member_live/show.ex:51
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Birth Date"
 #~ msgstr "Geburtsdatum"
+
+#~ #: lib/mv_web/live/user_live/show.ex:49
+#~ #, elixir-autogen, elixir-format
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Not set"
+#~ msgstr "Nicht gesetzt"
+
+#~ #: lib/mv_web/live/user_live/index.html.heex:52
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format
+#~ msgid "OIDC ID"
+#~ msgstr "OIDC ID"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 1e0e954..0240964 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -11,13 +11,13 @@
 msgid ""
 msgstr ""
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex:387
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/user_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
@@ -30,55 +30,57 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:53
 #: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/show.ex:59
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:82
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/user_live/index.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:76
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/user_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:41
-#: lib/mv_web/live/member_live/show.ex:116
+#: lib/mv_web/live/member_live/show.ex:42
+#: lib/mv_web/live/member_live/show.ex:114
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:47
 #: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/show.ex:51
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:48
+#: lib/mv_web/live/member_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:50
 #: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
@@ -89,7 +91,7 @@ msgid "New Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/user_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
@@ -110,20 +112,20 @@ msgid "close"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/show.ex:57
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:55
 #: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:60
+#: lib/mv_web/live/member_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/show.ex:58
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
@@ -132,21 +134,21 @@ msgstr ""
 #: lib/mv_web/live/components/payment_filter_component.ex:144
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/member_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:49
 #: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:54
+#: lib/mv_web/live/member_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:56
 #: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:61
+#: lib/mv_web/live/member_live/show.ex:62
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
@@ -156,59 +158,61 @@ msgstr ""
 msgid "Save Member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:66
+#: lib/mv_web/live/custom_field_live/form_component.ex:63
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
-#: lib/mv_web/live/global_settings_live.ex:55
+#: lib/mv_web/live/global_settings_live.ex:60
 #: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:54
 #: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:59
+#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:47
+#: lib/mv_web/live/member_live/show.ex:48
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:68
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:62
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:115
+#: lib/mv_web/live/member_live/show.ex:113
 #, elixir-autogen, elixir-format
 msgid "Show Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "This is a member record from your database."
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:65
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:110
+#: lib/mv_web/live/custom_field_live/form_component.ex:93
 #: lib/mv_web/live/custom_field_value_live/form.ex:233
 #: lib/mv_web/live/member_live/form.ex:137
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:111
+#: lib/mv_web/live/custom_field_live/form_component.ex:94
 #: lib/mv_web/live/custom_field_value_live/form.ex:234
 #: lib/mv_web/live/member_live/form.ex:138
 #, elixir-autogen, elixir-format
@@ -250,11 +254,11 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:69
-#: lib/mv_web/live/custom_field_live/index.ex:120
+#: lib/mv_web/live/custom_field_live/form_component.ex:61
+#: lib/mv_web/live/custom_field_live/index_component.ex:138
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/user_live/form.ex:252
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
@@ -264,7 +268,8 @@ msgstr ""
 msgid "Choose a member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:61
+#: lib/mv_web/live/custom_field_live/form_component.ex:50
+#: lib/mv_web/live/custom_field_live/index_component.ex:59
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -274,17 +279,12 @@ msgstr ""
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/form.ex:62
+#: lib/mv_web/live/custom_field_live/form_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
@@ -306,13 +306,14 @@ msgid "Member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/member_live/index.ex:73
+#: lib/mv_web/live/member_live/index.ex:74
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:51
+#: lib/mv_web/live/custom_field_live/form_component.ex:40
+#: lib/mv_web/live/custom_field_live/index_component.ex:53
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -322,14 +323,9 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
-#, elixir-autogen, elixir-format
-msgid "Not enabled"
-msgstr ""
-
 #: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
-msgid "Not set"
+msgid "Not enabled"
 msgstr ""
 
 #: lib/mv_web/live/user_live/form.ex:107
@@ -339,13 +335,7 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr ""
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
@@ -355,7 +345,7 @@ msgstr ""
 msgid "Profil"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:63
+#: lib/mv_web/live/custom_field_live/form_component.ex:52
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr ""
@@ -370,17 +360,20 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
+#: lib/mv_web/components/layouts/navbar.ex:26
 #: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/live/global_settings_live.ex:32
+#: lib/mv_web/live/global_settings_live.ex:42
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex:250
 #, elixir-autogen, elixir-format
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr ""
@@ -400,7 +393,7 @@ msgstr ""
 msgid "Use this form to manage user records in your database."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:266
+#: lib/mv_web/live/user_live/form.ex:268
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -411,7 +404,7 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:56
+#: lib/mv_web/live/custom_field_live/form_component.ex:45
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr ""
@@ -428,7 +421,7 @@ msgstr ""
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex:267
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
@@ -504,30 +497,30 @@ msgid "User will be created without a password. Check 'Set Password' to add one.
 msgstr ""
 
 #: lib/mv_web/live/user_live/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:62
+#: lib/mv_web/live/member_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex:56
+#: lib/mv_web/live/user_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:72
+#: lib/mv_web/live/member_live/show.ex:73
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:36
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex:37
+#: lib/mv_web/live/member_live/show.ex:39
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr ""
@@ -609,7 +602,7 @@ msgid "Choose a custom field"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:77
+#: lib/mv_web/live/member_live/show.ex:78
 #, elixir-autogen, elixir-format
 msgid "Custom Field Values"
 msgstr ""
@@ -619,7 +612,7 @@ msgstr ""
 msgid "Custom field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:117
+#: lib/mv_web/live/global_settings_live.ex:105
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr ""
@@ -634,7 +627,7 @@ msgstr ""
 msgid "Please select a custom field first"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:67
+#: lib/mv_web/live/custom_field_live/form_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr ""
@@ -644,12 +637,7 @@ msgstr ""
 msgid "Save Custom field value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:46
-#, elixir-autogen, elixir-format
-msgid "Use this form to manage custom_field records in your database."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/live/custom_field_live/index_component.ex:20
 #, elixir-autogen, elixir-format
 msgid "Custom Fields"
 msgstr ""
@@ -659,70 +647,64 @@ msgstr ""
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/show.ex:56
-#, elixir-autogen, elixir-format
-msgid "Auto-generated identifier (immutable)"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/index.ex:79
+#: lib/mv_web/live/custom_field_live/index_component.ex:97
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:87
+#: lib/mv_web/live/custom_field_live/index_component.ex:105
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:72
+#: lib/mv_web/live/custom_field_live/index_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:127
+#: lib/mv_web/live/custom_field_live/index_component.ex:146
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:109
+#: lib/mv_web/live/custom_field_live/index_component.ex:127
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:97
+#: lib/mv_web/live/custom_field_live/index_component.ex:115
 #, elixir-autogen, elixir-format
 msgid "To confirm deletion, please enter this text:"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:64
+#: lib/mv_web/live/custom_field_live/form_component.ex:56
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:51
+#: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format
 msgid "Association Name"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:31
-#: lib/mv_web/live/global_settings_live.ex:41
+#: lib/mv_web/live/global_settings_live.ex:50
 #, elixir-autogen, elixir-format
 msgid "Club Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:43
+#: lib/mv_web/live/global_settings_live.ex:44
 #, elixir-autogen, elixir-format
 msgid "Manage global settings for the association."
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:56
+#: lib/mv_web/live/global_settings_live.ex:61
 #, elixir-autogen, elixir-format
 msgid "Save Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:75
+#: lib/mv_web/live/global_settings_live.ex:87
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
 msgstr ""
@@ -737,7 +719,7 @@ msgstr ""
 msgid "Available members"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex:359
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr ""
@@ -777,7 +759,7 @@ msgstr ""
 msgid "Unlinking scheduled"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex:160
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -794,12 +776,12 @@ msgstr ""
 msgid "Copy emails"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex:149
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex:146
 #, elixir-autogen, elixir-format
 msgid "No members selected"
 msgstr ""
@@ -814,7 +796,7 @@ msgstr ""
 msgid "Open in email program"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex:169
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
@@ -853,3 +835,53 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Payment filter"
 msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex:110
+#, elixir-autogen, elixir-format
+msgid "Custom field deleted successfully"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format
+msgid "Edit Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex:119
+#, elixir-autogen, elixir-format
+msgid "Failed to delete custom field: %{error}"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format
+msgid "New Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:26
+#, elixir-autogen, elixir-format
+msgid "New Custom field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:63
+#, elixir-autogen, elixir-format
+msgid "Show in Overview"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex:125
+#, elixir-autogen, elixir-format
+msgid "Slug does not match. Deletion cancelled."
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:55
+#, elixir-autogen, elixir-format
+msgid "Value Type"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:22
+#, elixir-autogen, elixir-format
+msgid "These will appear in addition to other data when adding new members."
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:25
+#, elixir-autogen, elixir-format
+msgid "Back to custom field overview"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 319bcc3..a5a05b1 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -11,13 +11,13 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex:387
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/user_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
@@ -30,55 +30,57 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:53
 #: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/show.ex:59
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:82
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/user_live/index.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:76
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/user_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:41
-#: lib/mv_web/live/member_live/show.ex:116
+#: lib/mv_web/live/member_live/show.ex:42
+#: lib/mv_web/live/member_live/show.ex:114
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:47
 #: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/show.ex:51
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:48
+#: lib/mv_web/live/member_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:50
 #: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:55
+#: lib/mv_web/live/member_live/show.ex:56
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
@@ -89,7 +91,7 @@ msgid "New Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/user_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
@@ -110,20 +112,20 @@ msgid "close"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/show.ex:57
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:55
 #: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:60
+#: lib/mv_web/live/member_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/show.ex:58
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
@@ -132,21 +134,21 @@ msgstr ""
 #: lib/mv_web/live/components/payment_filter_component.ex:144
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/member_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:49
 #: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:54
+#: lib/mv_web/live/member_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:56
 #: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:61
+#: lib/mv_web/live/member_live/show.ex:62
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
@@ -156,59 +158,61 @@ msgstr ""
 msgid "Save Member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:66
+#: lib/mv_web/live/custom_field_live/form_component.ex:63
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
-#: lib/mv_web/live/global_settings_live.ex:55
+#: lib/mv_web/live/global_settings_live.ex:60
 #: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:54
 #: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:59
+#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:47
+#: lib/mv_web/live/member_live/show.ex:48
 #, elixir-autogen, elixir-format
 msgid "Id"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:68
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:62
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:115
+#: lib/mv_web/live/member_live/show.ex:113
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:33
+#: lib/mv_web/live/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "This is a member record from your database."
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:65
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:110
+#: lib/mv_web/live/custom_field_live/form_component.ex:93
 #: lib/mv_web/live/custom_field_value_live/form.ex:233
 #: lib/mv_web/live/member_live/form.ex:137
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:111
+#: lib/mv_web/live/custom_field_live/form_component.ex:94
 #: lib/mv_web/live/custom_field_value_live/form.ex:234
 #: lib/mv_web/live/member_live/form.ex:138
 #, elixir-autogen, elixir-format
@@ -250,11 +254,11 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:69
-#: lib/mv_web/live/custom_field_live/index.ex:120
+#: lib/mv_web/live/custom_field_live/form_component.ex:61
+#: lib/mv_web/live/custom_field_live/index_component.ex:138
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/user_live/form.ex:252
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
@@ -264,7 +268,8 @@ msgstr ""
 msgid "Choose a member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:61
+#: lib/mv_web/live/custom_field_live/form_component.ex:50
+#: lib/mv_web/live/custom_field_live/index_component.ex:59
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -274,17 +279,12 @@ msgstr ""
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/form.ex:62
+#: lib/mv_web/live/custom_field_live/form_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
@@ -306,13 +306,14 @@ msgid "Member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/member_live/index.ex:73
+#: lib/mv_web/live/member_live/index.ex:74
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:51
+#: lib/mv_web/live/custom_field_live/form_component.ex:40
+#: lib/mv_web/live/custom_field_live/index_component.ex:53
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -322,16 +323,11 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Not set"
-msgstr ""
-
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -339,13 +335,7 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr ""
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
@@ -355,7 +345,7 @@ msgstr ""
 msgid "Profil"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:63
+#: lib/mv_web/live/custom_field_live/form_component.ex:52
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr ""
@@ -370,17 +360,20 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
+#: lib/mv_web/components/layouts/navbar.ex:26
 #: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/live/global_settings_live.ex:32
+#: lib/mv_web/live/global_settings_live.ex:42
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex:250
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex:77
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show User"
 msgstr ""
@@ -400,7 +393,7 @@ msgstr ""
 msgid "Use this form to manage user records in your database."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:266
+#: lib/mv_web/live/user_live/form.ex:268
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -411,7 +404,7 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:56
+#: lib/mv_web/live/custom_field_live/form_component.ex:45
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr ""
@@ -428,7 +421,7 @@ msgstr ""
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex:267
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
@@ -504,30 +497,30 @@ 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/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Linked Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:62
+#: lib/mv_web/live/member_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex:56
+#: lib/mv_web/live/user_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:72
+#: lib/mv_web/live/member_live/show.ex:73
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:36
-#: lib/mv_web/live/member_live/show.ex:38
+#: lib/mv_web/live/member_live/show.ex:37
+#: lib/mv_web/live/member_live/show.ex:39
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr ""
@@ -609,7 +602,7 @@ msgid "Choose a custom field"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:77
+#: lib/mv_web/live/member_live/show.ex:78
 #, elixir-autogen, elixir-format
 msgid "Custom Field Values"
 msgstr ""
@@ -619,7 +612,7 @@ msgstr ""
 msgid "Custom field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:117
+#: lib/mv_web/live/global_settings_live.ex:105
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr ""
@@ -634,7 +627,7 @@ msgstr ""
 msgid "Please select a custom field first"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:67
+#: lib/mv_web/live/custom_field_live/form_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr ""
@@ -644,12 +637,7 @@ msgstr ""
 msgid "Save Custom field value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:46
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Use this form to manage custom_field records in your database."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/live/custom_field_live/index_component.ex:20
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Custom Fields"
 msgstr ""
@@ -659,70 +647,64 @@ msgstr ""
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/show.ex:56
-#, elixir-autogen, elixir-format
-msgid "Auto-generated identifier (immutable)"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/index.ex:79
+#: lib/mv_web/live/custom_field_live/index_component.ex:97
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:87
+#: lib/mv_web/live/custom_field_live/index_component.ex:105
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:72
+#: lib/mv_web/live/custom_field_live/index_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:127
+#: lib/mv_web/live/custom_field_live/index_component.ex:146
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:109
+#: lib/mv_web/live/custom_field_live/index_component.ex:127
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:97
+#: lib/mv_web/live/custom_field_live/index_component.ex:115
 #, elixir-autogen, elixir-format, fuzzy
 msgid "To confirm deletion, please enter this text:"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:64
+#: lib/mv_web/live/custom_field_live/form_component.ex:56
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:51
+#: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format
 msgid "Association Name"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:31
-#: lib/mv_web/live/global_settings_live.ex:41
+#: lib/mv_web/live/global_settings_live.ex:50
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Club Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:43
+#: lib/mv_web/live/global_settings_live.ex:44
 #, elixir-autogen, elixir-format
 msgid "Manage global settings for the association."
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:56
+#: lib/mv_web/live/global_settings_live.ex:61
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:75
+#: lib/mv_web/live/global_settings_live.ex:87
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
 msgstr ""
@@ -737,7 +719,7 @@ msgstr ""
 msgid "Available members"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex:359
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr ""
@@ -777,7 +759,7 @@ msgstr ""
 msgid "Unlinking scheduled"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex:160
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -794,12 +776,12 @@ msgstr ""
 msgid "Copy emails"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex:149
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex:146
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No members selected"
 msgstr ""
@@ -814,7 +796,7 @@ msgstr ""
 msgid "Open in email program"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex:169
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
@@ -854,8 +836,84 @@ msgstr ""
 msgid "Payment filter"
 msgstr ""
 
+#: lib/mv_web/live/global_settings_live.ex:110
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Custom field deleted successfully"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Edit Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex:119
+#, elixir-autogen, elixir-format
+msgid "Failed to delete custom field: %{error}"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:26
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:63
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Show in Overview"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex:125
+#, elixir-autogen, elixir-format
+msgid "Slug does not match. Deletion cancelled."
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:55
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Value Type"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:22
+#, elixir-autogen, elixir-format
+msgid "These will appear in addition to other data when adding new members."
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:25
+#, elixir-autogen, elixir-format
+msgid "Back to custom field overview"
+msgstr ""
+
+#~ #: lib/mv_web/live/custom_field_live/show.ex:56
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Auto-generated identifier (immutable)"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/form.ex:48
 #~ #: lib/mv_web/live/member_live/show.ex:51
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Birth Date"
 #~ msgstr ""
+
+#~ #: lib/mv_web/live/user_live/show.ex:49
+#~ #, elixir-autogen, elixir-format
+#~ msgid "ID"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Not set"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/user_live/index.html.heex:52
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format
+#~ msgid "OIDC ID"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/custom_field_live/form.ex:46
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Use this form to manage custom_field records in your database."
+#~ msgstr ""
diff --git a/test/membership/member_field_visibility_test.exs b/test/membership/member_field_visibility_test.exs
deleted file mode 100644
index 9963169..0000000
--- a/test/membership/member_field_visibility_test.exs
+++ /dev/null
@@ -1,14 +0,0 @@
-defmodule Mv.Membership.MemberFieldVisibilityTest do
-  @moduledoc """
-  Tests for member field visibility configuration.
-
-  Tests cover:
-  - Member fields are visible by default (show_in_overview: true)
-  - Member fields can be hidden (show_in_overview: false)
-  - Checking if a specific field is visible
-  - Configuration is stored in Settings resource
-  """
-  use Mv.DataCase, async: true
-
-  alias Mv.Membership.Member
-end
diff --git a/test/mv_web/live/custom_field_live/deletion_test.exs b/test/mv_web/live/custom_field_live/deletion_test.exs
index f0317e0..322cf38 100644
--- a/test/mv_web/live/custom_field_live/deletion_test.exs
+++ b/test/mv_web/live/custom_field_live/deletion_test.exs
@@ -1,6 +1,7 @@
 defmodule MvWeb.CustomFieldLive.DeletionTest do
   @moduledoc """
-  Tests for CustomFieldLive.Index deletion modal and slug confirmation.
+  Tests for CustomFieldLive.IndexComponent deletion modal and slug confirmation.
+  Tests the custom field management component embedded in the settings page.
 
   Tests cover:
   - Opening deletion confirmation modal
@@ -39,11 +40,11 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       # Create custom field value
       create_custom_field_value(member, custom_field, "test")
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
-      # Click delete button
+      # Click delete button - find the delete link within the component
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
       # Modal should be visible
@@ -65,10 +66,10 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       create_custom_field_value(member1, custom_field, "test1")
       create_custom_field_value(member2, custom_field, "test2")
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
       # Should show plural form
@@ -78,10 +79,10 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     test "shows 0 members for custom field without values", %{conn: conn} do
       {:ok, _custom_field} = create_custom_field("test_field", :string)
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
       # Should show 0 members
@@ -93,15 +94,16 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     test "updates confirmation state when typing", %{conn: conn} do
       {:ok, custom_field} = create_custom_field("test_field", :string)
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
-      # Type in slug input
+      # Type in slug input - use element to find the form with phx-target
       view
-      |> render_change("update_slug_confirmation", %{"slug" => custom_field.slug})
+      |> element("#delete-custom-field-modal form")
+      |> render_change(%{"slug" => custom_field.slug})
 
       # Confirm button should be enabled now (no disabled attribute)
       html = render(view)
@@ -111,15 +113,16 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     test "delete button is disabled when slug doesn't match", %{conn: conn} do
       {:ok, _custom_field} = create_custom_field("test_field", :string)
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
-      # Type wrong slug
+      # Type wrong slug - use element to find the form with phx-target
       view
-      |> render_change("update_slug_confirmation", %{"slug" => "wrong-slug"})
+      |> element("#delete-custom-field-modal form")
+      |> render_change(%{"slug" => "wrong-slug"})
 
       # Button should be disabled
       html = render(view)
@@ -133,20 +136,21 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       {:ok, custom_field} = create_custom_field("test_field", :string)
       {:ok, custom_field_value} = create_custom_field_value(member, custom_field, "test")
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       # Open modal
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
-      # Enter correct slug
+      # Enter correct slug - use element to find the form with phx-target
       view
-      |> render_change("update_slug_confirmation", %{"slug" => custom_field.slug})
+      |> element("#delete-custom-field-modal form")
+      |> render_change(%{"slug" => custom_field.slug})
 
       # Click confirm
       view
-      |> element("button", "Delete Custom Field and All Values")
+      |> element("#delete-custom-field-modal button", "Delete Custom Field and All Values")
       |> render_click()
 
       # Should show success message
@@ -162,27 +166,28 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       assert {:ok, _} = Ash.get(Member, member.id)
     end
 
-    test "shows error when slug doesn't match", %{conn: conn} do
+    test "button remains disabled and custom field not deleted when slug doesn't match", %{
+      conn: conn
+    } do
       {:ok, custom_field} = create_custom_field("test_field", :string)
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
-      # Enter wrong slug
+      # Enter wrong slug - use element to find the form with phx-target
       view
-      |> render_change("update_slug_confirmation", %{"slug" => "wrong-slug"})
+      |> element("#delete-custom-field-modal form")
+      |> render_change(%{"slug" => "wrong-slug"})
 
-      # Try to confirm (button should be disabled, but test the handler anyway)
-      view
-      |> render_click("confirm_delete", %{})
+      # Button should be disabled and we cannot click it
+      # The test verifies that the button is properly disabled in the UI
+      html = render(view)
+      assert html =~ ~r/disabled(?:=""|(?!\w))/
 
-      # Should show error message
-      assert render(view) =~ "Slug does not match"
-
-      # Custom field should still exist
+      # Custom field should still exist since deletion couldn't proceed
       assert {:ok, _} = Ash.get(CustomField, custom_field.id)
     end
   end
@@ -191,10 +196,10 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     test "closes modal without deleting", %{conn: conn} do
       {:ok, custom_field} = create_custom_field("test_field", :string)
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
       # Modal should be visible
@@ -202,7 +207,7 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
 
       # Click cancel
       view
-      |> element("button", "Cancel")
+      |> element("#delete-custom-field-modal button", "Cancel")
       |> render_click()
 
       # Modal should be gone
diff --git a/test/mv_web/live/profile_navigation_test.exs b/test/mv_web/live/profile_navigation_test.exs
index 5ba5eb0..4b383c6 100644
--- a/test/mv_web/live/profile_navigation_test.exs
+++ b/test/mv_web/live/profile_navigation_test.exs
@@ -148,8 +148,6 @@ defmodule MvWeb.ProfileNavigationTest do
       "/members/new",
       "/custom_field_values",
       "/custom_field_values/new",
-      "/custom_fields",
-      "/custom_fields/new",
       "/users",
       "/users/new"
     ]

From ed961f7585984d4f891d11bf4595e79a7322c5e3 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Wed, 3 Dec 2025 13:34:44 +0100
Subject: [PATCH 08/12] Redesign member view/edit UI with improved
 accessibility

- Group fields into Personal Data, Custom Fields, and Payment Data sections
- Fix WCAG AA contrast issues and semantic HTML (dt/dd in dl)
- Format mailto links with member name in href attribute
---
 lib/mv_web/live/member_live/form.ex    | 284 ++++++++---
 lib/mv_web/live/member_live/show.ex    | 347 ++++++++++---
 priv/gettext/de/LC_MESSAGES/default.po | 673 ++++++-------------------
 priv/gettext/default.pot               | 617 +++++------------------
 priv/gettext/en/LC_MESSAGES/default.po | 643 +++++------------------
 5 files changed, 922 insertions(+), 1642 deletions(-)

diff --git a/lib/mv_web/live/member_live/form.ex b/lib/mv_web/live/member_live/form.ex
index 5370154..4781cd5 100644
--- a/lib/mv_web/live/member_live/form.ex
+++ b/lib/mv_web/live/member_live/form.ex
@@ -5,80 +5,212 @@ defmodule MvWeb.MemberLive.Form do
   ## Features
   - Create new members with personal information
   - Edit existing member details
-  - Manage custom properties (dynamic fields)
+  - Grouped sections for better organization
+  - Tab navigation (Payments tab disabled, coming soon)
+  - Manage custom properties (dynamic fields, displayed sorted by name)
   - Real-time validation with visual feedback
-  - Link/unlink user accounts
 
-  ## Form Fields
-  **Required:**
-  - first_name, last_name, email
-
-  **Optional:**
-  - phone_number, address fields (city, street, house_number, postal_code)
-  - join_date, exit_date
-  - paid status
-  - notes
-
-  ## Custom Field Values
-  Members can have dynamic custom field values defined by CustomFields.
-  The form dynamically renders inputs based on available CustomFields.
+  ## Form Sections
+  - Personal Data: Name, address, contact information, membership dates, notes
+  - Custom Fields: Dynamic fields in uniform grid layout (displayed sorted by name)
+  - Payment Data: Mockup section (not editable)
 
   ## Events
   - `validate` - Real-time form validation
   - `save` - Submit form (create or update member)
-  - Custom field value management events for adding/removing custom fields
   """
   use MvWeb, :live_view
 
   @impl true
   def render(assigns) do
+    # Sort custom fields by name for display only
+    sorted_custom_fields = Enum.sort_by(assigns.custom_fields, & &1.name)
+    assigns = assign(assigns, :sorted_custom_fields, sorted_custom_fields)
+
     ~H"""
     <Layouts.app flash={@flash} current_user={@current_user}>
-      <.header>
-        {@page_title}
-        <:subtitle>
-          {gettext("Fields marked with an asterisk (*) cannot be empty.")}
-        </:subtitle>
-      </.header>
-
       <.form for={@form} id="member-form" phx-change="validate" phx-submit="save">
-        <.input field={@form[:first_name]} label={gettext("First Name")} required />
-        <.input field={@form[:last_name]} label={gettext("Last Name")} required />
-        <.input field={@form[:email]} label={gettext("Email")} required type="email" />
-        <.input field={@form[:paid]} label={gettext("Paid")} type="checkbox" />
-        <.input field={@form[:phone_number]} label={gettext("Phone Number")} />
-        <.input field={@form[:join_date]} label={gettext("Join Date")} type="date" />
-        <.input field={@form[:exit_date]} label={gettext("Exit Date")} type="date" />
-        <.input field={@form[:notes]} label={gettext("Notes")} />
-        <.input field={@form[:city]} label={gettext("City")} />
-        <.input field={@form[:street]} label={gettext("Street")} />
-        <.input field={@form[:house_number]} label={gettext("House Number")} />
-        <.input field={@form[:postal_code]} label={gettext("Postal Code")} />
+        <%!-- Header with Back button, Name display, and Save button --%>
+        <div class="flex items-center justify-between gap-4 pb-4">
+          <.button navigate={return_path(@return_to, @member)} type="button">
+            <.icon name="hero-arrow-left" class="size-4" />
+            {gettext("Back")}
+          </.button>
 
-        <h3 class="mt-8 mb-2 text-lg font-semibold">{gettext("Custom Field Values")}</h3>
-        <.inputs_for :let={f_custom_field_value} field={@form[:custom_field_values]}>
-          <% type =
-            Enum.find(@custom_fields, &(&1.id == f_custom_field_value[:custom_field_id].value)) %>
-          <.inputs_for :let={value_form} field={f_custom_field_value[:value]}>
-            <% input_type =
-              cond do
-                type && type.value_type == :boolean -> "checkbox"
-                type && type.value_type == :date -> :date
-                true -> :text
-              end %>
-            <.input field={value_form[:value]} label={type && type.name} type={input_type} />
-          </.inputs_for>
-          <input
-            type="hidden"
-            name={f_custom_field_value[:custom_field_id].name}
-            value={f_custom_field_value[:custom_field_id].value}
-          />
-        </.inputs_for>
+          <h1 class="text-2xl font-bold text-center flex-1">
+            <%= if @member do %>
+              {@member.first_name} {@member.last_name}
+            <% else %>
+              {gettext("New Member")}
+            <% end %>
+          </h1>
 
-        <.button phx-disable-with={gettext("Saving...")} variant="primary">
-          {gettext("Save Member")}
-        </.button>
-        <.button navigate={return_path(@return_to, @member)}>{gettext("Cancel")}</.button>
+          <.button phx-disable-with={gettext("Saving...")} variant="primary" type="submit">
+            {gettext("Save")}
+          </.button>
+        </div>
+
+        <%!-- Tab Navigation --%>
+        <div role="tablist" class="tabs tabs-bordered mb-6">
+          <button type="button" role="tab" class="tab tab-active" aria-selected="true">
+            <.icon name="hero-identification" class="size-4 mr-2" />
+            {gettext("Contact Data")}
+          </button>
+          <button
+            type="button"
+            role="tab"
+            class="tab"
+            disabled
+            aria-disabled="true"
+            title={gettext("Coming soon")}
+          >
+            <.icon name="hero-credit-card" class="size-4 mr-2" />
+            {gettext("Payments")}
+          </button>
+        </div>
+
+        <%!-- Personal Data and Custom Fields Row --%>
+        <div class="grid grid-cols-1 lg:grid-cols-2 gap-6 mb-6">
+          <%!-- Personal Data Section --%>
+          <div>
+            <.form_section title={gettext("Personal Data")}>
+              <div class="space-y-4">
+                <%!-- Name Row --%>
+                <div class="flex gap-4">
+                  <div class="w-48">
+                    <.input field={@form[:first_name]} label={gettext("First Name")} required />
+                  </div>
+                  <div class="w-48">
+                    <.input field={@form[:last_name]} label={gettext("Last Name")} required />
+                  </div>
+                </div>
+
+                <%!-- Address Row --%>
+                <div class="flex gap-4">
+                  <div class="flex-1">
+                    <.input field={@form[:street]} label={gettext("Street")} />
+                  </div>
+                  <div class="w-16">
+                    <.input field={@form[:house_number]} label={gettext("Nr.")} />
+                  </div>
+                  <div class="w-24">
+                    <.input field={@form[:postal_code]} label={gettext("Postal Code")} />
+                  </div>
+                  <div class="w-32">
+                    <.input field={@form[:city]} label={gettext("City")} />
+                  </div>
+                </div>
+
+                <%!-- Email --%>
+                <div>
+                  <.input field={@form[:email]} label={gettext("Email")} required type="email" />
+                </div>
+
+                <%!-- Phone --%>
+                <div>
+                  <.input field={@form[:phone_number]} label={gettext("Phone")} type="tel" />
+                </div>
+
+                <%!-- Membership Dates Row --%>
+                <div class="flex gap-4">
+                  <div class="w-36">
+                    <.input field={@form[:join_date]} label={gettext("Join Date")} type="date" />
+                  </div>
+                  <div class="w-36">
+                    <.input field={@form[:exit_date]} label={gettext("Exit Date")} type="date" />
+                  </div>
+                </div>
+
+                <%!-- Notes --%>
+                <div>
+                  <.input field={@form[:notes]} label={gettext("Notes")} type="textarea" />
+                </div>
+              </div>
+            </.form_section>
+          </div>
+
+          <%!-- Custom Fields Section --%>
+          <%= if Enum.any?(@custom_fields) do %>
+            <div>
+              <.form_section title={gettext("Custom Fields")}>
+                <div class="grid grid-cols-2 gap-4">
+                  <%!-- Render in sorted order by finding the form for each sorted custom field --%>
+                  <%= for cf <- @sorted_custom_fields do %>
+                    <.inputs_for :let={f_cfv} field={@form[:custom_field_values]}>
+                      <%= if f_cfv[:custom_field_id].value == cf.id do %>
+                        <div class={if cf.value_type == :boolean, do: "flex items-end", else: ""}>
+                          <.inputs_for :let={value_form} field={f_cfv[:value]}>
+                            <.input
+                              field={value_form[:value]}
+                              label={cf.name}
+                              type={custom_field_input_type(cf.value_type)}
+                            />
+                          </.inputs_for>
+                          <input
+                            type="hidden"
+                            name={f_cfv[:custom_field_id].name}
+                            value={f_cfv[:custom_field_id].value}
+                          />
+                        </div>
+                      <% end %>
+                    </.inputs_for>
+                  <% end %>
+                </div>
+              </.form_section>
+            </div>
+          <% end %>
+        </div>
+
+        <%!-- Payment Data Section (Mockup) --%>
+        <div class="max-w-xl">
+          <.form_section title={gettext("Payment Data")}>
+            <div role="alert" class="alert alert-info mb-4">
+              <.icon name="hero-information-circle" class="size-5" />
+              <span>{gettext("This data is for demonstration purposes only (mockup).")}</span>
+            </div>
+
+            <div class="flex gap-8">
+              <div class="w-24">
+                <label for="mock-contribution" class="label text-sm font-medium">
+                  {gettext("Contribution")}
+                </label>
+                <input
+                  type="text"
+                  id="mock-contribution"
+                  value="72 €"
+                  disabled
+                  class="input input-bordered w-full bg-base-200"
+                />
+              </div>
+              <div class="w-40">
+                <label class="label text-sm font-medium">{gettext("Payment Cycle")}</label>
+                <div class="flex gap-3 mt-2">
+                  <label class="flex items-center gap-1 cursor-not-allowed opacity-60">
+                    <input type="radio" name="mock_cycle" checked disabled class="radio radio-sm" />
+                    <span class="text-sm">{gettext("monthly")}</span>
+                  </label>
+                  <label class="flex items-center gap-1 cursor-not-allowed opacity-60">
+                    <input type="radio" name="mock_cycle" disabled class="radio radio-sm" />
+                    <span class="text-sm">{gettext("yearly")}</span>
+                  </label>
+                </div>
+              </div>
+              <div class="w-24 flex items-end">
+                <.input field={@form[:paid]} label={gettext("Paid")} type="checkbox" />
+              </div>
+            </div>
+          </.form_section>
+        </div>
+
+        <%!-- Bottom Action Buttons --%>
+        <div class="flex justify-end gap-4 mt-6">
+          <.button navigate={return_path(@return_to, @member)} type="button">
+            {gettext("Cancel")}
+          </.button>
+          <.button phx-disable-with={gettext("Saving...")} variant="primary" type="submit">
+            {gettext("Save Member")}
+          </.button>
+        </div>
       </.form>
     </Layouts.app>
     """
@@ -106,8 +238,8 @@ defmodule MvWeb.MemberLive.Form do
         id -> Ash.get!(Mv.Membership.Member, id)
       end
 
-    action = if is_nil(member), do: "New", else: "Edit"
-    page_title = action <> " " <> "Member"
+    action = if is_nil(member), do: gettext("New"), else: gettext("Edit")
+    page_title = "#{action} #{gettext("Member")}"
 
     {:ok,
      socket
@@ -213,5 +345,37 @@ defmodule MvWeb.MemberLive.Form do
   end
 
   defp return_path("index", _member), do: ~p"/members"
+  defp return_path("show", nil), do: ~p"/members"
   defp return_path("show", member), do: ~p"/members/#{member.id}"
+
+  # -----------------------------------------------------------------
+  # Helper Components
+  # -----------------------------------------------------------------
+
+  # Renders a form section box with border and title.
+  attr :title, :string, required: true
+  slot :inner_block, required: true
+
+  defp form_section(assigns) do
+    ~H"""
+    <section class="mb-6">
+      <h2 class="text-lg font-semibold mb-3">{@title}</h2>
+      <div class="border border-base-300 rounded-lg p-4 bg-base-100">
+        {render_slot(@inner_block)}
+      </div>
+    </section>
+    """
+  end
+
+  # -----------------------------------------------------------------
+  # Helper Functions for Custom Fields
+  # -----------------------------------------------------------------
+
+  # Returns input type for custom field based on value type
+  defp custom_field_input_type(:string), do: "text"
+  defp custom_field_input_type(:integer), do: "number"
+  defp custom_field_input_type(:boolean), do: "checkbox"
+  defp custom_field_input_type(:date), do: "date"
+  defp custom_field_input_type(:email), do: "email"
+  defp custom_field_input_type(_), do: "text"
 end
diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex
index 7601f46..55d8991 100644
--- a/lib/mv_web/live/member_live/show.ex
+++ b/lib/mv_web/live/member_live/show.ex
@@ -3,19 +3,16 @@ defmodule MvWeb.MemberLive.Show do
   LiveView for displaying a single member's details.
 
   ## Features
-  - Display all member information (personal, contact, address)
-  - Show linked user account (if exists)
-  - Display custom field values
+  - Display all member information in grouped sections
+  - Tab navigation for future features (Payments)
+  - Show custom field values with type-based formatting
   - Navigate to edit form
   - Return to member list
 
-  ## Displayed Information
-  - Basic: name, email, dates (join, exit)
-  - Contact: phone number
-  - Address: street, house number, postal code, city
-  - Status: paid flag
-  - Relationships: linked user account
-  - Custom: dynamic custom field values from CustomFields
+  ## Sections
+  - Personal Data: Name, address, contact information, membership dates, notes
+  - Custom Fields: Dynamic fields in uniform grid layout (sorted by name)
+  - Payment Data: Mockup section with placeholder data
 
   ## Navigation
   - Back to member list
@@ -23,69 +20,155 @@ defmodule MvWeb.MemberLive.Show do
   """
   use MvWeb, :live_view
   import Ash.Query
-  alias MvWeb.Helpers.DateFormatter
 
   @impl true
   def render(assigns) do
     ~H"""
     <Layouts.app flash={@flash} current_user={@current_user}>
-      <.header>
-        {@member.first_name} {@member.last_name}
-        <:subtitle>{gettext("This is a member record from your database.")}</:subtitle>
+      <%!-- Header with Back button, Name, and Edit button --%>
+      <div class="flex items-center justify-between gap-4 pb-4">
+        <.button navigate={~p"/members"} aria-label={gettext("Back to members list")}>
+          <.icon name="hero-arrow-left" class="size-4" />
+          {gettext("Back")}
+        </.button>
 
-        <:actions>
-          <.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")}
-          </.button>
-        </:actions>
-      </.header>
+        <h1 class="text-2xl font-bold text-center flex-1">
+          {@member.first_name} {@member.last_name}
+        </h1>
 
-      <.list>
-        <:item title={gettext("Id")}>{@member.id}</:item>
-        <:item title={gettext("First Name")}>{@member.first_name}</:item>
-        <:item title={gettext("Last Name")}>{@member.last_name}</:item>
-        <:item title={gettext("Email")}>{@member.email}</:item>
-        <:item title={gettext("Paid")}>
-          {if @member.paid, do: gettext("Yes"), else: gettext("No")}
-        </:item>
-        <:item title={gettext("Phone Number")}>{@member.phone_number}</:item>
-        <:item title={gettext("Join Date")}>{DateFormatter.format_date(@member.join_date)}</:item>
-        <:item title={gettext("Exit Date")}>{DateFormatter.format_date(@member.exit_date)}</:item>
-        <:item title={gettext("Notes")}>{@member.notes}</:item>
-        <:item title={gettext("City")}>{@member.city}</:item>
-        <:item title={gettext("Street")}>{@member.street}</:item>
-        <:item title={gettext("House Number")}>{@member.house_number}</:item>
-        <:item title={gettext("Postal Code")}>{@member.postal_code}</:item>
-        <:item title={gettext("Linked User")}>
-          <%= if @member.user do %>
-            <.link
-              navigate={~p"/users/#{@member.user}"}
-              class="text-blue-600 hover:text-blue-800 underline"
-            >
-              <.icon name="hero-user" class="h-4 w-4 inline mr-1" />
-              {@member.user.email}
-            </.link>
-          <% else %>
-            <span class="text-gray-500 italic">{gettext("No user linked")}</span>
-          <% end %>
-        </:item>
-      </.list>
+        <.button variant="primary" navigate={~p"/members/#{@member}/edit?return_to=show"}>
+          {gettext("Edit Member")}
+        </.button>
+      </div>
 
-      <h3 class="mt-8 mb-2 text-lg font-semibold">{gettext("Custom Field Values")}</h3>
-      <.generic_list items={
-        Enum.map(@member.custom_field_values, fn cfv ->
-          {
-            # name
-            cfv.custom_field && cfv.custom_field.name,
-            # value
-            format_custom_field_value(cfv)
-          }
-        end)
-      } />
+      <%!-- Tab Navigation --%>
+      <div role="tablist" class="tabs tabs-bordered mb-6">
+        <button role="tab" class="tab tab-active" aria-selected="true">
+          <.icon name="hero-identification" class="size-4 mr-2" />
+          {gettext("Contact Data")}
+        </button>
+        <button role="tab" class="tab" disabled aria-disabled="true" title={gettext("Coming soon")}>
+          <.icon name="hero-credit-card" class="size-4 mr-2" />
+          {gettext("Payments")}
+        </button>
+      </div>
+
+      <%!-- Personal Data and Custom Fields Row --%>
+      <div class="grid grid-cols-1 lg:grid-cols-2 gap-6 mb-6">
+        <%!-- Personal Data Section --%>
+        <div>
+          <.section_box title={gettext("Personal Data")}>
+            <div class="space-y-4">
+              <%!-- Name Row --%>
+              <div class="flex gap-6">
+                <.data_field label={gettext("First Name")} value={@member.first_name} class="w-48" />
+                <.data_field label={gettext("Last Name")} value={@member.last_name} class="w-48" />
+              </div>
+
+              <%!-- Address --%>
+              <div>
+                <.data_field label={gettext("Address")} value={format_address(@member)} />
+              </div>
+
+              <%!-- Email --%>
+              <div>
+                <.data_field label={gettext("Email")}>
+                  <a
+                    href={"mailto:#{format_email_mailto(@member.first_name, @member.last_name, @member.email)}"}
+                    class="text-blue-700 hover:text-blue-800 underline"
+                  >
+                    {@member.email}
+                  </a>
+                </.data_field>
+              </div>
+
+              <%!-- Phone --%>
+              <div>
+                <.data_field label={gettext("Phone")} value={@member.phone_number} />
+              </div>
+
+              <%!-- Membership Dates Row --%>
+              <div class="flex gap-6">
+                <.data_field
+                  label={gettext("Join Date")}
+                  value={format_date(@member.join_date)}
+                  class="w-28"
+                />
+                <.data_field
+                  label={gettext("Exit Date")}
+                  value={format_date(@member.exit_date)}
+                  class="w-28"
+                />
+              </div>
+
+              <%!-- Linked User --%>
+              <div>
+                <.data_field label={gettext("Linked User")}>
+                  <%= if @member.user do %>
+                    <.link
+                      navigate={~p"/users/#{@member.user}"}
+                      class="text-blue-700 hover:text-blue-800 underline inline-flex items-center gap-1"
+                    >
+                      <.icon name="hero-user" class="size-4" />
+                      {@member.user.email}
+                    </.link>
+                  <% else %>
+                    <span class="text-base-content/70 italic">{gettext("No user linked")}</span>
+                  <% end %>
+                </.data_field>
+              </div>
+
+              <%!-- Notes --%>
+              <%= if @member.notes && String.trim(@member.notes) != "" do %>
+                <div>
+                  <.data_field label={gettext("Notes")}>
+                    <p class="whitespace-pre-wrap text-base-content/80">{@member.notes}</p>
+                  </.data_field>
+                </div>
+              <% end %>
+            </div>
+          </.section_box>
+        </div>
+
+        <%!-- Custom Fields Section --%>
+        <%= if Enum.any?(@member.custom_field_values) do %>
+          <div>
+            <.section_box title={gettext("Custom Fields")}>
+              <div class="grid grid-cols-2 gap-4">
+                <%= for cfv <- sort_custom_field_values(@member.custom_field_values) do %>
+                  <% custom_field = cfv.custom_field %>
+                  <% value_type = custom_field && custom_field.value_type %>
+                  <.data_field label={custom_field && custom_field.name}>
+                    {format_custom_field_value(cfv.value, value_type)}
+                  </.data_field>
+                <% end %>
+              </div>
+            </.section_box>
+          </div>
+        <% end %>
+      </div>
+
+      <%!-- Payment Data Section (Mockup) --%>
+      <div class="max-w-xl">
+        <.section_box title={gettext("Payment Data")}>
+          <div role="alert" class="alert alert-info mb-4">
+            <.icon name="hero-information-circle" class="size-5" />
+            <span>{gettext("This data is for demonstration purposes only (mockup).")}</span>
+          </div>
+
+          <div class="flex gap-6">
+            <.data_field label={gettext("Contribution")} value="72 €" class="w-24" />
+            <.data_field label={gettext("Payment Cycle")} value={gettext("monthly")} class="w-28" />
+            <.data_field label={gettext("Paid")} class="w-24">
+              <%= if @member.paid do %>
+                <span class="badge badge-success">{gettext("Paid")}</span>
+              <% else %>
+                <span class="badge badge-warning">{gettext("Pending")}</span>
+              <% end %>
+            </.data_field>
+          </div>
+        </.section_box>
+      </div>
     </Layouts.app>
     """
   end
@@ -113,16 +196,132 @@ defmodule MvWeb.MemberLive.Show do
   defp page_title(:show), do: gettext("Show Member")
   defp page_title(:edit), do: gettext("Edit Member")
 
-  defp format_custom_field_value(cfv) do
-    value =
-      case cfv.value do
-        %{value: v} -> v
-        v -> v
-      end
+  # -----------------------------------------------------------------
+  # Helper Components
+  # -----------------------------------------------------------------
 
-    case value do
-      %Date{} = date -> DateFormatter.format_date(date)
-      other -> other
+  # Renders a section box with border and title.
+  attr :title, :string, required: true
+  slot :inner_block, required: true
+
+  defp section_box(assigns) do
+    ~H"""
+    <section class="mb-6">
+      <h2 class="text-lg font-semibold mb-3">{@title}</h2>
+      <div class="border border-base-300 rounded-lg p-4 bg-base-100">
+        {render_slot(@inner_block)}
+      </div>
+    </section>
+    """
+  end
+
+  # Renders a labeled data field.
+  attr :label, :string, required: true
+  attr :value, :string, default: nil
+  attr :class, :string, default: ""
+  slot :inner_block
+
+  defp data_field(assigns) do
+    ~H"""
+    <dl class={@class}>
+      <dt class="text-sm font-medium text-base-content/70">{@label}</dt>
+      <dd class="mt-1 text-base-content">
+        <%= if @inner_block != [] do %>
+          {render_slot(@inner_block)}
+        <% else %>
+          {display_value(@value)}
+        <% end %>
+      </dd>
+    </dl>
+    """
+  end
+
+  # -----------------------------------------------------------------
+  # Helper Functions
+  # -----------------------------------------------------------------
+
+  defp display_value(nil), do: "—"
+  defp display_value(""), do: "—"
+  defp display_value(value), do: value
+
+  defp format_email_mailto(first_name, last_name, email) do
+    name =
+      [first_name, last_name]
+      |> Enum.filter(&(&1 && &1 != ""))
+      |> Enum.join(" ")
+
+    if name != "" do
+      "#{name} <#{email}>"
+    else
+      email
     end
   end
+
+  defp format_address(member) do
+    street_part =
+      [member.street, member.house_number]
+      |> Enum.filter(&(&1 && &1 != ""))
+      |> Enum.join(" ")
+
+    city_part =
+      [member.postal_code, member.city]
+      |> Enum.filter(&(&1 && &1 != ""))
+      |> Enum.join(" ")
+
+    [street_part, city_part]
+    |> Enum.filter(&(&1 != ""))
+    |> Enum.join(", ")
+    |> case do
+      "" -> nil
+      address -> address
+    end
+  end
+
+  defp format_date(nil), do: nil
+
+  defp format_date(%Date{} = date) do
+    Calendar.strftime(date, "%d.%m.%Y")
+  end
+
+  defp format_date(date), do: to_string(date)
+
+  # Sorts custom field values by custom field name
+  defp sort_custom_field_values(custom_field_values) do
+    Enum.sort_by(custom_field_values, fn cfv ->
+      (cfv.custom_field && cfv.custom_field.name) || ""
+    end)
+  end
+
+  # Formats custom field value based on type
+  defp format_custom_field_value(%Ash.Union{value: value, type: type}, _expected_type) do
+    format_custom_field_value(value, type)
+  end
+
+  defp format_custom_field_value(nil, _type), do: "—"
+
+  defp format_custom_field_value(value, :boolean) when is_boolean(value) do
+    if value, do: gettext("Yes"), else: gettext("No")
+  end
+
+  defp format_custom_field_value(%Date{} = date, :date) do
+    Calendar.strftime(date, "%d.%m.%Y")
+  end
+
+  defp format_custom_field_value(value, :email) when is_binary(value) do
+    assigns = %{email: value}
+
+    ~H"""
+    <a href={"mailto:#{@email}"} class="text-blue-700 hover:text-blue-800 underline">{@email}</a>
+    """
+  end
+
+  defp format_custom_field_value(value, :integer) when is_integer(value) do
+    Integer.to_string(value)
+  end
+
+  defp format_custom_field_value(value, _type) when is_binary(value) do
+    if String.trim(value) == "", do: "—", else: value
+  end
+
+  defp format_custom_field_value(value, _type), do: to_string(value)
 end
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 607ad9e..c6f2028 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -10,14 +10,13 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/mv_web/components/core_components.ex:387
-#: lib/mv_web/live/contribution_period_live/show.ex:141
+#: lib/mv_web/components/core_components.ex:386
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr "Aktionen"
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:71
+#: lib/mv_web/live/user_live/index.html.heex:72
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr "Bist du sicher?"
@@ -28,71 +27,69 @@ msgstr "Bist du sicher?"
 msgid "Attempting to reconnect"
 msgstr "Verbindung wird wiederhergestellt"
 
-#: lib/mv_web/live/member_live/form.ex:53
+#: lib/mv_web/live/member_live/form.ex:100
 #: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:59
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr "Stadt"
 
-#: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:73
+#: lib/mv_web/live/user_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr "Löschen"
 
-#: lib/mv_web/live/contribution_type_live/index.ex:66
+#: lib/mv_web/live/member_live/form.ex:241
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:267
-#: lib/mv_web/live/user_live/index.html.heex:65
+#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Edit"
-msgstr "Bearbeiten"
+msgstr "Bearbeite"
 
-#: lib/mv_web/live/member_live/show.ex:42
-#: lib/mv_web/live/member_live/show.ex:114
+#: lib/mv_web/live/member_live/show.ex:40
+#: lib/mv_web/live/member_live/show.ex:197
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr "Mitglied bearbeiten"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:58
-#: lib/mv_web/live/member_live/form.ex:47
+#: lib/mv_web/live/member_live/form.ex:106
 #: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/member_live/show.ex:75
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:49
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr "E-Mail"
 
-#: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/form.ex:81
+#: lib/mv_web/live/member_live/show.ex:64
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr "Vorname"
 
-#: lib/mv_web/live/member_live/form.ex:50
+#: lib/mv_web/live/member_live/form.ex:117
 #: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/show.ex:93
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr "Beitrittsdatum"
 
-#: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/form.ex:84
+#: lib/mv_web/live/member_live/show.ex:65
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr "Nachname"
 
+#: lib/mv_web/live/member_live/form.ex:44
 #: lib/mv_web/live/member_live/index.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "New Member"
 msgstr "Neues Mitglied"
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:62
+#: lib/mv_web/live/user_live/index.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr "Anzeigen"
@@ -112,52 +109,45 @@ msgstr "Keine Internetverbindung gefunden"
 msgid "close"
 msgstr "schließen"
 
-#: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/form.ex:120
+#: lib/mv_web/live/member_live/show.ex:98
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr "Austrittsdatum"
 
-#: lib/mv_web/live/member_live/form.ex:55
 #: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr "Hausnummer"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:140
-#: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/form.ex:126
+#: lib/mv_web/live/member_live/show.ex:124
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Notizen"
 
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
-#: lib/mv_web/live/contribution_period_live/show.ex:186
-#: lib/mv_web/live/contribution_period_live/show.ex:241
-#: lib/mv_web/live/member_live/form.ex:48
+#: lib/mv_web/live/member_live/form.ex:199
 #: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/show.ex:162
+#: lib/mv_web/live/member_live/show.ex:164
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr "Bezahlt"
 
-#: lib/mv_web/live/member_live/form.ex:49
 #: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: lib/mv_web/live/member_live/form.ex:56
+#: lib/mv_web/live/member_live/form.ex:97
 #: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:62
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: lib/mv_web/live/member_live/form.ex:79
+#: lib/mv_web/live/member_live/form.ex:211
 #, elixir-autogen, elixir-format
 msgid "Save Member"
 msgstr "Mitglied speichern"
@@ -165,58 +155,48 @@ msgstr "Mitglied speichern"
 #: lib/mv_web/live/custom_field_live/form.ex:66
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
 #: lib/mv_web/live/global_settings_live.ex:55
-#: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/member_live/form.ex:48
+#: lib/mv_web/live/member_live/form.ex:210
+#: lib/mv_web/live/user_live/form.ex:248
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: lib/mv_web/live/member_live/form.ex:54
+#: lib/mv_web/live/member_live/form.ex:91
 #: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr "Straße"
 
-#: lib/mv_web/live/member_live/show.ex:48
-#, elixir-autogen, elixir-format
-msgid "Id"
-msgstr "ID"
-
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:62
-#: lib/mv_web/live/member_live/show.ex:53
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:303
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr "Nein"
 
-#: lib/mv_web/live/member_live/show.ex:113
+#: lib/mv_web/live/member_live/show.ex:196
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr "Mitglied anzeigen"
 
-#: lib/mv_web/live/member_live/show.ex:34
-#, elixir-autogen, elixir-format
-msgid "This is a member record from your database."
-msgstr "Dies ist ein Mitglied aus deiner Datenbank."
-
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:53
+#: lib/mv_web/live/member_live/index/formatter.ex:60
+#: lib/mv_web/live/member_live/show.ex:303
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr "Ja"
 
 #: lib/mv_web/live/custom_field_live/form.ex:110
 #: lib/mv_web/live/custom_field_value_live/form.ex:233
-#: lib/mv_web/live/member_live/form.ex:137
+#: lib/mv_web/live/member_live/form.ex:269
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr "erstellt"
 
 #: lib/mv_web/live/custom_field_live/form.ex:111
 #: lib/mv_web/live/custom_field_value_live/form.ex:234
-#: lib/mv_web/live/member_live/form.ex:138
+#: lib/mv_web/live/member_live/form.ex:270
 #, elixir-autogen, elixir-format
 msgid "update"
 msgstr "aktualisiert"
@@ -226,7 +206,7 @@ msgstr "aktualisiert"
 msgid "Incorrect email or password"
 msgstr "Falsche E-Mail oder Passwort"
 
-#: lib/mv_web/live/member_live/form.ex:144
+#: lib/mv_web/live/member_live/form.ex:276
 #, elixir-autogen, elixir-format
 msgid "Member %{action} successfully"
 msgstr "Mitglied %{action} erfolgreich"
@@ -259,8 +239,8 @@ msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt"
 #: lib/mv_web/live/custom_field_live/form.ex:69
 #: lib/mv_web/live/custom_field_live/index.ex:120
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
-#: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:252
+#: lib/mv_web/live/member_live/form.ex:208
+#: lib/mv_web/live/user_live/form.ex:251
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -280,17 +260,22 @@ msgstr "Beschreibung"
 msgid "Edit User"
 msgstr "Benutzer*in bearbeiten"
 
-#: lib/mv_web/live/user_live/show.ex:51
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr "Aktiviert"
 
+#: lib/mv_web/live/user_live/show.ex:49
+#, elixir-autogen, elixir-format
+msgid "ID"
+msgstr "ID"
+
 #: lib/mv_web/live/custom_field_live/form.ex:62
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr "Unveränderlich"
 
-#: lib/mv_web/components/layouts/navbar.ex:113
+#: lib/mv_web/components/layouts/navbar.ex:102
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr "Abmelden"
@@ -302,19 +287,18 @@ msgid "Listing Users"
 msgstr "Benutzer*innen auflisten"
 
 #: lib/mv_web/live/custom_field_value_live/form.ex:60
+#: lib/mv_web/live/member_live/form.ex:242
 #, elixir-autogen, elixir-format
 msgid "Member"
 msgstr "Mitglied"
 
 #: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/contribution_type_live/index.ex:61
-#: lib/mv_web/live/member_live/index.ex:74
+#: lib/mv_web/live/member_live/index.ex:73
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr "Mitglieder"
 
-#: lib/mv_web/live/contribution_type_live/index.ex:48
 #: lib/mv_web/live/custom_field_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -325,12 +309,16 @@ msgstr "Name"
 msgid "New User"
 msgstr "Neue*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/show.ex:51
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr "Nicht aktiviert"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:207
+#: lib/mv_web/live/user_live/show.ex:51
+#, elixir-autogen, elixir-format
+msgid "Not set"
+msgstr "Nicht gesetzt"
+
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -338,12 +326,18 @@ msgstr "Nicht aktiviert"
 msgid "Note"
 msgstr "Hinweis"
 
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:51
+#, elixir-autogen, elixir-format
+msgid "OIDC ID"
+msgstr "OIDC ID"
+
+#: lib/mv_web/live/user_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr "Passwort-Authentifizierung"
 
-#: lib/mv_web/components/layouts/navbar.ex:106
+#: lib/mv_web/components/layouts/navbar.ex:95
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr "Profil"
@@ -363,17 +357,17 @@ msgstr "Alle Mitglieder auswählen"
 msgid "Select member"
 msgstr "Mitglied auswählen"
 
-#: lib/mv_web/components/layouts/navbar.ex:110
+#: lib/mv_web/components/layouts/navbar.ex:99
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: lib/mv_web/live/user_live/form.ex:250
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Save User"
 msgstr "Benutzer*in speichern"
 
-#: lib/mv_web/live/user_live/show.ex:77
+#: lib/mv_web/live/user_live/show.ex:79
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr "Benutzer*in anzeigen"
@@ -393,7 +387,7 @@ msgstr "Nicht unterstützter Wertetyp: %{type}"
 msgid "Use this form to manage user records in your database."
 msgstr "Verwenden Sie dieses Formular, um Benutzer*innen-Datensätze zu verwalten."
 
-#: lib/mv_web/live/user_live/form.ex:268
+#: lib/mv_web/live/user_live/form.ex:266
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -421,7 +415,8 @@ msgstr "aufsteigend"
 msgid "descending"
 msgstr "absteigend"
 
-#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/member_live/form.ex:241
+#: lib/mv_web/live/user_live/form.ex:265
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr "Neue*r"
@@ -497,30 +492,29 @@ msgid "User will be created without a password. Check 'Set Password' to add one.
 msgstr "Benutzer*in wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen."
 
 #: lib/mv_web/live/user_live/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/index.html.heex:53
+#: lib/mv_web/live/user_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr "Verknüpftes Mitglied"
 
-#: lib/mv_web/live/member_live/show.ex:63
+#: lib/mv_web/live/member_live/show.ex:106
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr "Verknüpfte*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/index.html.heex:56
-#: lib/mv_web/live/user_live/show.ex:63
+#: lib/mv_web/live/user_live/index.html.heex:57
+#: lib/mv_web/live/user_live/show.ex:65
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr "Kein Mitglied verknüpft"
 
-#: lib/mv_web/live/member_live/show.ex:73
+#: lib/mv_web/live/member_live/show.ex:116
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr "Keine*r Benutzer*in verknüpft"
 
-#: lib/mv_web/live/member_live/show.ex:37
-#: lib/mv_web/live/member_live/show.ex:39
+#: lib/mv_web/live/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr "Zurück zur Mitgliederliste"
@@ -531,14 +525,14 @@ msgstr "Zurück zur Mitgliederliste"
 msgid "Back to users list"
 msgstr "Zurück zur Benutzer*innen-Liste"
 
-#: lib/mv_web/components/layouts/navbar.ex:44
-#: lib/mv_web/components/layouts/navbar.ex:50
+#: lib/mv_web/components/layouts/navbar.ex:33
+#: lib/mv_web/components/layouts/navbar.ex:39
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr "Sprache auswählen"
 
-#: lib/mv_web/components/layouts/navbar.ex:57
-#: lib/mv_web/components/layouts/navbar.ex:77
+#: lib/mv_web/components/layouts/navbar.ex:46
+#: lib/mv_web/components/layouts/navbar.ex:66
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr "Dunklen Modus umschalten"
@@ -601,12 +595,6 @@ msgstr "Diese E-Mail-Adresse ist bereits mit einem anderen OIDC-Konto verknüpft
 msgid "Choose a custom field"
 msgstr "Wähle ein Benutzerdefiniertes Feld"
 
-#: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:78
-#, elixir-autogen, elixir-format
-msgid "Custom Field Values"
-msgstr "Benutzerdefinierte Feldwerte"
-
 #: lib/mv_web/live/custom_field_value_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Custom field"
@@ -643,6 +631,8 @@ msgid "Use this form to manage custom_field records in your database."
 msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten."
 
 #: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/live/member_live/form.ex:135
+#: lib/mv_web/live/member_live/show.ex:136
 #, elixir-autogen, elixir-format
 msgid "Custom Fields"
 msgstr "Benutzerdefinierte Felder"
@@ -710,7 +700,6 @@ msgstr "Vereinsdaten"
 msgid "Manage global settings for the association."
 msgstr "Passe übergreifende Einstellungen für den Verein an."
 
-#: lib/mv_web/live/contribution_settings_live.ex:102
 #: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
@@ -731,7 +720,7 @@ msgstr "Ein Mitglied mit dieser E-Mail-Adresse existiert bereits. Um mit einem a
 msgid "Available members"
 msgstr "Verfügbare Mitglieder"
 
-#: lib/mv_web/live/user_live/form.ex:359
+#: lib/mv_web/live/user_live/form.ex:357
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr "Fehler beim Verlinken des Mitglieds: %{error}"
@@ -771,7 +760,7 @@ msgstr "Mitglied entverknüpfen"
 msgid "Unlinking scheduled"
 msgstr "Entverknüpfung geplant"
 
-#: lib/mv_web/live/member_live/index.ex:160
+#: lib/mv_web/live/member_live/index.ex:159
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -788,12 +777,12 @@ msgstr "E-Mail-Adressen der ausgewählten Mitglieder kopieren"
 msgid "Copy emails"
 msgstr "E-Mails kopieren"
 
-#: lib/mv_web/live/member_live/index.ex:149
+#: lib/mv_web/live/member_live/index.ex:148
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr "Keine E-Mail-Adressen gefunden"
 
-#: lib/mv_web/live/member_live/index.ex:146
+#: lib/mv_web/live/member_live/index.ex:145
 #, elixir-autogen, elixir-format
 msgid "No members selected"
 msgstr "Keine Mitglieder ausgewählt"
@@ -808,16 +797,11 @@ msgstr "E-Mail-Programm mit BCC-Empfänger*innen öffnen"
 msgid "Open in email program"
 msgstr "Im E-Mail-Programm öffnen"
 
-#: lib/mv_web/live/member_live/index.ex:169
+#: lib/mv_web/live/member_live/index.ex:168
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr "Tipp: E-Mail-Adressen ins BCC-Feld einfügen für Datenschutzkonformität"
 
-#: lib/mv_web/live/member_live/form.ex:40
-#, elixir-autogen, elixir-format
-msgid "Fields marked with an asterisk (*) cannot be empty."
-msgstr "Felder, die mit einem Sternchen (*) markiert sind, dürfen nicht leer bleiben."
-
 #: lib/mv_web/components/core_components.ex:206
 #: lib/mv_web/components/core_components.ex:223
 #: lib/mv_web/components/core_components.ex:250
@@ -848,450 +832,103 @@ msgstr "Nicht bezahlt"
 msgid "Payment filter"
 msgstr "Zahlungsfilter"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:107
+#: lib/mv_web/live/member_live/show.ex:70
 #, elixir-autogen, elixir-format
-msgid "%{count} period selected"
-msgid_plural "%{count} periods selected"
-msgstr[0] "%{count} Beiträge ausgewählt"
-msgstr[1] "%{count} Beiträge ausgewählt"
+msgid "Address"
+msgstr "Adresse"
 
-#: lib/mv_web/live/contribution_type_live/index.ex:113
+#: lib/mv_web/live/member_live/form.ex:37
+#: lib/mv_web/live/member_live/show.ex:32
 #, elixir-autogen, elixir-format
-msgid "About Contribution Types"
-msgstr "Über Beitragsarten"
+msgid "Back"
+msgstr "Zurück"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:138
-#: lib/mv_web/live/contribution_type_live/index.ex:53
+#: lib/mv_web/live/member_live/form.ex:65
+#: lib/mv_web/live/member_live/show.ex:50
 #, elixir-autogen, elixir-format
-msgid "Amount"
-msgstr "Betrag"
+msgid "Coming soon"
+msgstr "Demnächst verfügbar"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:48
+#: lib/mv_web/live/member_live/form.ex:57
+#: lib/mv_web/live/member_live/show.ex:48
 #, elixir-autogen, elixir-format
-msgid "Back to Settings"
-msgstr "Zurück zu Einstellungen"
+msgid "Contact Data"
+msgstr "Kontaktdaten"
 
-#: lib/mv_web/live/contribution_type_live/index.ex:124
+#: lib/mv_web/live/member_live/form.ex:175
+#: lib/mv_web/live/member_live/show.ex:160
 #, elixir-autogen, elixir-format
-msgid "Can be changed at any time. Amount changes affect future periods only."
-msgstr "Kann jederzeit geändert werden. Betragsänderungen wirken sich nur auf zukünftige Beiträge aus."
+msgid "Contribution"
+msgstr "Beitrag"
 
-#: lib/mv_web/live/contribution_type_live/index.ex:77
+#: lib/mv_web/live/member_live/form.ex:94
 #, elixir-autogen, elixir-format
-msgid "Cannot delete - members assigned"
-msgstr "Löschen nicht möglich - Mitglieder zugewiesen"
+msgid "Nr."
+msgstr "Nr."
 
-#: lib/mv_web/live/contribution_period_live/show.ex:83
+#: lib/mv_web/live/member_live/form.ex:186
+#: lib/mv_web/live/member_live/show.ex:161
 #, elixir-autogen, elixir-format
-msgid "Change Contribution Type"
-msgstr "Beitragsart ändern"
+msgid "Payment Cycle"
+msgstr "Zahlungszyklus"
 
-#: lib/mv_web/live/contribution_settings_live.ex:42
+#: lib/mv_web/live/member_live/form.ex:166
+#: lib/mv_web/live/member_live/show.ex:153
 #, elixir-autogen, elixir-format
-msgid "Configure global settings for membership contributions."
-msgstr "Globale Einstellungen für Mitgliedsbeiträge konfigurieren."
+msgid "Payment Data"
+msgstr "Beitragsdaten"
 
-#: lib/mv_web/components/layouts/navbar.ex:34
-#: lib/mv_web/live/contribution_settings_live.ex:27
-#: lib/mv_web/live/contribution_settings_live.ex:40
+#: lib/mv_web/live/member_live/form.ex:68
+#: lib/mv_web/live/member_live/show.ex:52
 #, elixir-autogen, elixir-format
-msgid "Contribution Settings"
-msgstr "Beitragseinstellungen"
+msgid "Payments"
+msgstr "Zahlungen"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:62
+#: lib/mv_web/live/member_live/show.ex:166
 #, elixir-autogen, elixir-format
-msgid "Contribution Start"
-msgstr "Beitragsbeginn"
+msgid "Pending"
+msgstr "Ausstehend"
 
-#: lib/mv_web/components/layouts/navbar.ex:32
-#: lib/mv_web/live/contribution_type_live/index.ex:25
-#: lib/mv_web/live/contribution_type_live/index.ex:36
+#: lib/mv_web/live/member_live/form.ex:76
+#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
-msgid "Contribution Types"
-msgstr "Beitragsarten"
+msgid "Personal Data"
+msgstr "Persönliche Daten"
 
-#: lib/mv_web/live/contribution_settings_live.ex:224
+#: lib/mv_web/live/member_live/form.ex:111
+#: lib/mv_web/live/member_live/show.ex:87
 #, elixir-autogen, elixir-format
-msgid "Contribution start"
-msgstr "Beitragsbeginn"
+msgid "Phone"
+msgstr "Telefon"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:41
+#: lib/mv_web/live/member_live/form.ex:49
 #, elixir-autogen, elixir-format
-msgid "Contribution type"
-msgstr "Beitragsart"
+msgid "Save"
+msgstr "Speichern"
 
-#: lib/mv_web/live/contribution_type_live/index.ex:117
+#: lib/mv_web/live/member_live/form.ex:169
+#: lib/mv_web/live/member_live/show.ex:156
 #, elixir-autogen, elixir-format
-msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
-msgstr "Beitragsarten definieren verschiedene Mitgliedsbeitragsstrukturen. Jede Art hat ein festes Intervall (monatlich, quartalsweise, halbjährlich, jährlich), das nach der Erstellung nicht mehr geändert werden kann."
+msgid "This data is for demonstration purposes only (mockup)."
+msgstr "Diese Daten dienen nur zu Demonstrationszwecken (Mockup)."
 
-#: lib/mv_web/components/layouts/navbar.ex:30
+#: lib/mv_web/live/member_live/form.ex:190
+#: lib/mv_web/live/member_live/show.ex:161
 #, elixir-autogen, elixir-format
-msgid "Contributions"
-msgstr "Beiträge"
+msgid "monthly"
+msgstr "monatlich"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:39
+#: lib/mv_web/live/member_live/form.ex:194
 #, elixir-autogen, elixir-format
-msgid "Contributions for %{name}"
-msgstr "Beiträge für %{name}"
+msgid "yearly"
+msgstr "jährlich"
 
-#: lib/mv_web/live/contribution_period_live/show.ex:159
-#, elixir-autogen, elixir-format
-msgid "Current"
-msgstr "Aktuell"
-
-#: lib/mv_web/live/contribution_settings_live.ex:60
-#, elixir-autogen, elixir-format
-msgid "Default Contribution Type"
-msgstr "Standard-Beitragsart"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:133
-#, elixir-autogen, elixir-format
-msgid "Deletion"
-msgstr "Löschung"
-
-#: lib/mv_web/live/contribution_settings_live.ex:173
-#, elixir-autogen, elixir-format
-msgid "Example: Member Contribution View"
-msgstr "Beispiel: Mitglieder-Beitragsansicht"
-
-#: lib/mv_web/live/contribution_settings_live.ex:113
-#, elixir-autogen, elixir-format
-msgid "Examples"
-msgstr "Beispiele"
-
-#: lib/mv_web/live/contribution_settings_live.ex:262
-#: lib/mv_web/live/contribution_type_live/index.ex:172
-#, elixir-autogen, elixir-format
-msgid "Family"
-msgstr "Familie"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:128
-#, elixir-autogen, elixir-format
-msgid "Fixed after creation. Members can only switch between types with the same interval."
-msgstr "Nach der Erstellung unveränderlich. Mitglieder können nur zwischen Arten mit demselben Intervall wechseln."
-
-#: lib/mv_web/live/contribution_settings_live.ex:228
-#, elixir-autogen, elixir-format
-msgid "Generated periods"
-msgstr "Generierte Beiträge"
-
-#: lib/mv_web/live/contribution_settings_live.ex:52
-#, elixir-autogen, elixir-format
-msgid "Global Settings"
-msgstr "Globale Einstellungen"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:343
-#: lib/mv_web/live/contribution_settings_live.ex:275
-#: lib/mv_web/live/contribution_type_live/index.ex:203
-#, elixir-autogen, elixir-format
-msgid "Half-yearly"
-msgstr "Halbjährlich"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:181
-#, elixir-autogen, elixir-format
-msgid "Half-yearly contribution for supporting members"
-msgstr "Halbjährlicher Beitrag für Fördermitglieder"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_type_live/index.ex:188
-#, elixir-autogen, elixir-format
-msgid "Honorary"
-msgstr "Ehrenmitglied"
-
-#: lib/mv_web/live/contribution_settings_live.ex:85
-#, elixir-autogen, elixir-format
-msgid "Include joining period"
-msgstr "Zahlt ab Zeitpunkt des Eintritts"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:137
-#: lib/mv_web/live/contribution_type_live/index.ex:57
-#: lib/mv_web/live/contribution_type_live/index.ex:127
-#, elixir-autogen, elixir-format
-msgid "Interval"
-msgstr "Intervall"
-
-#: lib/mv_web/live/contribution_settings_live.ex:220
-#, elixir-autogen, elixir-format
-msgid "Joining date"
-msgstr "Eintrittsdatum"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:331
-#, elixir-autogen, elixir-format
-msgid "Joining year - reduced to 0"
-msgstr "Eintrittsjahr - auf 0 reduziert"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:38
-#, elixir-autogen, elixir-format
-msgid "Manage contribution types for membership fees."
-msgstr "Beitragsarten für Mitgliedsbeiträge verwalten."
-
-#: lib/mv_web/live/contribution_period_live/show.ex:116
-#, elixir-autogen, elixir-format
-msgid "Mark as Paid"
-msgstr "Als bezahlt markieren"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:120
-#, elixir-autogen, elixir-format
-msgid "Mark as Suspended"
-msgstr "Als ausgesetzt markieren"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:124
-#, elixir-autogen, elixir-format
-msgid "Mark as Unpaid"
-msgstr "Als unbezahlt markieren"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:26
-#, elixir-autogen, elixir-format
-msgid "Member Contributions"
-msgstr "Mitgliedsbeiträge"
-
-#: lib/mv_web/live/contribution_settings_live.ex:122
-#, elixir-autogen, elixir-format
-msgid "Member pays for the year they joined"
-msgstr "Mitglied zahlt für das Eintrittsjahr"
-
-#: lib/mv_web/live/contribution_settings_live.ex:155
-#, elixir-autogen, elixir-format
-msgid "Member pays from the joining month"
-msgstr "Mitglied zahlt ab dem Eintrittsmonat"
-
-#: lib/mv_web/live/contribution_settings_live.ex:144
-#, elixir-autogen, elixir-format
-msgid "Member pays from the next full quarter"
-msgstr "Mitglied zahlt ab dem nächsten vollen Quartal"
-
-#: lib/mv_web/live/contribution_settings_live.ex:133
-#, elixir-autogen, elixir-format
-msgid "Member pays from the next full year"
-msgstr "Mitglied zahlt ab dem nächsten vollen Jahr"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:43
-#, elixir-autogen, elixir-format
-msgid "Member since"
-msgstr "Mitglied seit"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:92
-#, elixir-autogen, elixir-format
-msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
-msgstr "Mitglieder können nur zwischen Beitragsarten mit demselben Zahlungsintervall wechseln (z.B. jährlich zu jährlich). Dies verhindert komplexe Periodenüberschneidungen."
-
-#: lib/mv_web/live/contribution_period_live/show.ex:341
-#: lib/mv_web/live/contribution_settings_live.ex:273
-#: lib/mv_web/live/contribution_type_live/index.ex:201
-#, elixir-autogen, elixir-format
-msgid "Monthly"
-msgstr "Monatlich"
-
-#: lib/mv_web/live/contribution_settings_live.ex:150
-#, elixir-autogen, elixir-format
-msgid "Monthly Interval - Joining Period Included"
-msgstr "Monatliches Intervall - Eintrittsperiode eingeschlossen"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:165
-#, elixir-autogen, elixir-format
-msgid "Monthly fee for students and trainees"
-msgstr "Monatlicher Beitrag für Studierende und Auszubildende"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:123
-#, elixir-autogen, elixir-format
-msgid "Name & Amount"
-msgstr "Name & Betrag"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:42
-#, elixir-autogen, elixir-format
-msgid "New Contribution Type"
-msgstr "Neue Beitragsart"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:189
-#, elixir-autogen, elixir-format
-msgid "No fee for honorary members"
-msgstr "Kein Beitrag für Ehrenmitglieder"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:134
-#, elixir-autogen, elixir-format
-msgid "Only possible if no members are assigned to this type."
-msgstr "Nur möglich, wenn keine Mitglieder dieser Art zugewiesen sind."
-
-#: lib/mv_web/live/contribution_period_live/show.ex:70
-#, elixir-autogen, elixir-format
-msgid "Open Contributions"
-msgstr "Offene Beiträge"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:301
-#, elixir-autogen, elixir-format
-msgid "Paid via bank transfer"
-msgstr "Per Überweisung bezahlt"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:225
-#: lib/mv_web/live/contribution_settings_live.ex:197
-#: lib/mv_web/live/contribution_type_live/index.ex:97
-#, elixir-autogen, elixir-format
-msgid "Preview Mockup"
-msgstr "Vorschau"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:342
-#: lib/mv_web/live/contribution_settings_live.ex:274
-#: lib/mv_web/live/contribution_type_live/index.ex:202
-#, elixir-autogen, elixir-format
-msgid "Quarterly"
-msgstr "Quartalsweise"
-
-#: lib/mv_web/live/contribution_settings_live.ex:139
-#, elixir-autogen, elixir-format
-msgid "Quarterly Interval - Joining Period Excluded"
-msgstr "Quartalsintervall - Eintrittsperiode ausgeschlossen"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:173
-#, elixir-autogen, elixir-format
-msgid "Quarterly fee for family memberships"
-msgstr "Quartalsbeitrag für Familienmitgliedschaften"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:86
-#: lib/mv_web/live/contribution_settings_live.ex:250
-#: lib/mv_web/live/contribution_type_live/index.ex:156
-#, elixir-autogen, elixir-format
-msgid "Reduced"
-msgstr "Ermäßigt"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:157
-#, elixir-autogen, elixir-format
-msgid "Reduced fee for unemployed, pensioners, or low income"
-msgstr "Ermäßigter Beitrag für Arbeitslose, Rentner*innen oder Geringverdienende"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:275
-#: lib/mv_web/live/contribution_settings_live.ex:244
-#: lib/mv_web/live/contribution_type_live/index.ex:148
-#, elixir-autogen, elixir-format
-msgid "Regular"
-msgstr "Regulär"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:204
-#, elixir-autogen, elixir-format
-msgid "Reopen"
-msgstr "Wieder öffnen"
-
-#: lib/mv_web/live/contribution_settings_live.ex:176
-#, elixir-autogen, elixir-format
-msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
-msgstr "Sehen Sie, wie die Beitragsperioden für ein einzelnes Mitglied angezeigt werden. Dieses Beispiel zeigt Maria Weber mit mehreren Beitragsperioden."
-
-#: lib/mv_web/live/contribution_type_live/index.ex:149
-#, elixir-autogen, elixir-format
-msgid "Standard membership fee for regular members"
-msgstr "Standard-Mitgliedsbeitrag für reguläre Mitglieder"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:139
-#, elixir-autogen, elixir-format
-msgid "Status"
-msgstr "Status"
-
-#: lib/mv_web/live/contribution_settings_live.ex:256
-#: lib/mv_web/live/contribution_type_live/index.ex:164
-#, elixir-autogen, elixir-format
-msgid "Student"
-msgstr "Student*in"
-
-#: lib/mv_web/live/contribution_type_live/index.ex:180
-#, elixir-autogen, elixir-format
-msgid "Supporting Member"
-msgstr "Fördermitglied"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:195
-#, elixir-autogen, elixir-format
-msgid "Suspend"
-msgstr "Aussetzen"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:259
-#, elixir-autogen, elixir-format
-msgid "Suspended"
-msgstr "Ausgesetzt"
-
-#: lib/mv_web/live/contribution_settings_live.ex:69
-#, elixir-autogen, elixir-format
-msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
-msgstr "Diese Beitragsart wird automatisch allen neuen Mitgliedern zugewiesen. Kann pro Mitglied individuell geändert werden."
-
-#: lib/mv_web/live/contribution_period_live/show.ex:227
-#: lib/mv_web/live/contribution_settings_live.ex:199
-#: lib/mv_web/live/contribution_type_live/index.ex:99
-#, elixir-autogen, elixir-format
-msgid "This page is not functional and only displays the planned features."
-msgstr "Diese Seite ist nicht funktional und zeigt nur die geplanten Funktionen."
-
-#: lib/mv_web/live/contribution_period_live/show.ex:136
-#, elixir-autogen, elixir-format
-msgid "Time Period"
-msgstr "Zeitraum"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:66
-#, elixir-autogen, elixir-format
-msgid "Total Contributions"
-msgstr "Beiträge gesamt"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:250
-#, elixir-autogen, elixir-format
-msgid "Unpaid"
-msgstr "Unbezahlt"
-
-#: lib/mv_web/live/contribution_settings_live.ex:183
-#, elixir-autogen, elixir-format
-msgid "View Example Member"
-msgstr "Beispielmitglied ansehen"
-
-#: lib/mv_web/live/contribution_settings_live.ex:90
-#, elixir-autogen, elixir-format
-msgid "When active: Members pay from the period of their joining."
-msgstr "Wenn aktiv: Mitglieder zahlen ab der Periode ihres Eintritts."
-
-#: lib/mv_web/live/contribution_settings_live.ex:93
-#, elixir-autogen, elixir-format
-msgid "When inactive: Members pay from the next full period after joining."
-msgstr "Wenn inaktiv: Mitglieder zahlen ab der nächsten vollen Periode nach dem Eintritt."
-
-#: lib/mv_web/live/contribution_period_live/show.ex:98
-#, elixir-autogen, elixir-format
-msgid "Why are not all contribution types shown?"
-msgstr "Warum werden nicht alle Beitragsarten angezeigt?"
-
-#: lib/mv_web/live/contribution_period_live/show.ex:85
-#: lib/mv_web/live/contribution_period_live/show.ex:86
-#: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_period_live/show.ex:344
-#: lib/mv_web/live/contribution_settings_live.ex:276
-#: lib/mv_web/live/contribution_type_live/index.ex:204
-#, elixir-autogen, elixir-format
-msgid "Yearly"
-msgstr "Jährlich"
-
-#: lib/mv_web/live/contribution_settings_live.ex:128
-#, elixir-autogen, elixir-format
-msgid "Yearly Interval - Joining Period Excluded"
-msgstr "Jährliches Intervall - Eintrittsperiode ausgeschlossen"
-
-#: lib/mv_web/live/contribution_settings_live.ex:117
-#, elixir-autogen, elixir-format
-msgid "Yearly Interval - Joining Period Included"
-msgstr "Jährliches Intervall - Eintrittsperiode eingeschlossen"
-
-#~ #: lib/mv_web/live/member_live/form.ex:48
-#~ #: lib/mv_web/live/member_live/show.ex:51
+#~ #: lib/mv_web/live/member_live/show.ex:47
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Birth Date"
-#~ msgstr "Geburtsdatum"
-
-#~ #: lib/mv_web/live/user_live/show.ex:49
-#~ #, elixir-autogen, elixir-format
-#~ msgid "ID"
+#~ msgid "Id"
 #~ msgstr "ID"
 
-#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #: lib/mv_web/live/member_live/show.ex:33
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Not set"
-#~ msgstr "Nicht gesetzt"
-
-#~ #: lib/mv_web/live/user_live/index.html.heex:52
-#~ #: lib/mv_web/live/user_live/show.ex:51
-#~ #, elixir-autogen, elixir-format
-#~ msgid "OIDC ID"
-#~ msgstr "OIDC ID"
+#~ msgid "This is a member record from your database."
+#~ msgstr "Dies ist ein Mitglied aus deiner Datenbank."
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index b66c5ed..9f0d0aa 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -11,14 +11,13 @@
 msgid ""
 msgstr ""
 
-#: lib/mv_web/components/core_components.ex:387
-#: lib/mv_web/live/contribution_period_live/show.ex:141
+#: lib/mv_web/components/core_components.ex:386
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:71
+#: lib/mv_web/live/user_live/index.html.heex:72
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
@@ -29,71 +28,69 @@ msgstr ""
 msgid "Attempting to reconnect"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:53
+#: lib/mv_web/live/member_live/form.ex:100
 #: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:59
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:73
+#: lib/mv_web/live/user_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:66
+#: lib/mv_web/live/member_live/form.ex:241
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:267
-#: lib/mv_web/live/user_live/index.html.heex:65
+#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:42
-#: lib/mv_web/live/member_live/show.ex:114
+#: lib/mv_web/live/member_live/show.ex:40
+#: lib/mv_web/live/member_live/show.ex:197
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:58
-#: lib/mv_web/live/member_live/form.ex:47
+#: lib/mv_web/live/member_live/form.ex:106
 #: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/member_live/show.ex:75
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:49
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/form.ex:81
+#: lib/mv_web/live/member_live/show.ex:64
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:50
+#: lib/mv_web/live/member_live/form.ex:117
 #: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/show.ex:93
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/form.ex:84
+#: lib/mv_web/live/member_live/show.ex:65
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
 
+#: lib/mv_web/live/member_live/form.ex:44
 #: lib/mv_web/live/member_live/index.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "New Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:62
+#: lib/mv_web/live/user_live/index.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
@@ -113,52 +110,45 @@ msgstr ""
 msgid "close"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/form.ex:120
+#: lib/mv_web/live/member_live/show.ex:98
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:55
 #: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:140
-#: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/form.ex:126
+#: lib/mv_web/live/member_live/show.ex:124
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
-#: lib/mv_web/live/contribution_period_live/show.ex:186
-#: lib/mv_web/live/contribution_period_live/show.ex:241
-#: lib/mv_web/live/member_live/form.ex:48
+#: lib/mv_web/live/member_live/form.ex:199
 #: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/show.ex:162
+#: lib/mv_web/live/member_live/show.ex:164
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:49
 #: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:56
+#: lib/mv_web/live/member_live/form.ex:97
 #: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:62
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:79
+#: lib/mv_web/live/member_live/form.ex:211
 #, elixir-autogen, elixir-format
 msgid "Save Member"
 msgstr ""
@@ -166,58 +156,48 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/form.ex:66
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
 #: lib/mv_web/live/global_settings_live.ex:55
-#: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/member_live/form.ex:48
+#: lib/mv_web/live/member_live/form.ex:210
+#: lib/mv_web/live/user_live/form.ex:248
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:54
+#: lib/mv_web/live/member_live/form.ex:91
 #: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:48
-#, elixir-autogen, elixir-format
-msgid "Id"
-msgstr ""
-
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:62
-#: lib/mv_web/live/member_live/show.ex:53
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:303
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:113
+#: lib/mv_web/live/member_live/show.ex:196
 #, elixir-autogen, elixir-format
 msgid "Show Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:34
-#, elixir-autogen, elixir-format
-msgid "This is a member record from your database."
-msgstr ""
-
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:53
+#: lib/mv_web/live/member_live/index/formatter.ex:60
+#: lib/mv_web/live/member_live/show.ex:303
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
 
 #: lib/mv_web/live/custom_field_live/form.ex:110
 #: lib/mv_web/live/custom_field_value_live/form.ex:233
-#: lib/mv_web/live/member_live/form.ex:137
+#: lib/mv_web/live/member_live/form.ex:269
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
 #: lib/mv_web/live/custom_field_live/form.ex:111
 #: lib/mv_web/live/custom_field_value_live/form.ex:234
-#: lib/mv_web/live/member_live/form.ex:138
+#: lib/mv_web/live/member_live/form.ex:270
 #, elixir-autogen, elixir-format
 msgid "update"
 msgstr ""
@@ -227,7 +207,7 @@ msgstr ""
 msgid "Incorrect email or password"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:144
+#: lib/mv_web/live/member_live/form.ex:276
 #, elixir-autogen, elixir-format
 msgid "Member %{action} successfully"
 msgstr ""
@@ -260,8 +240,8 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/form.ex:69
 #: lib/mv_web/live/custom_field_live/index.ex:120
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
-#: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:252
+#: lib/mv_web/live/member_live/form.ex:208
+#: lib/mv_web/live/user_live/form.ex:251
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
@@ -281,17 +261,22 @@ msgstr ""
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:51
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
+#: lib/mv_web/live/user_live/show.ex:49
+#, elixir-autogen, elixir-format
+msgid "ID"
+msgstr ""
+
 #: lib/mv_web/live/custom_field_live/form.ex:62
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:113
+#: lib/mv_web/components/layouts/navbar.ex:102
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
@@ -303,19 +288,18 @@ msgid "Listing Users"
 msgstr ""
 
 #: lib/mv_web/live/custom_field_value_live/form.ex:60
+#: lib/mv_web/live/member_live/form.ex:242
 #, elixir-autogen, elixir-format
 msgid "Member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/contribution_type_live/index.ex:61
-#: lib/mv_web/live/member_live/index.ex:74
+#: lib/mv_web/live/member_live/index.ex:73
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:48
 #: lib/mv_web/live/custom_field_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -326,12 +310,16 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:51
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:207
+#: lib/mv_web/live/user_live/show.ex:51
+#, elixir-autogen, elixir-format
+msgid "Not set"
+msgstr ""
+
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -339,12 +327,18 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:51
+#, elixir-autogen, elixir-format
+msgid "OIDC ID"
+msgstr ""
+
+#: lib/mv_web/live/user_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:106
+#: lib/mv_web/components/layouts/navbar.ex:95
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
@@ -364,17 +358,17 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:110
+#: lib/mv_web/components/layouts/navbar.ex:99
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:250
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:77
+#: lib/mv_web/live/user_live/show.ex:79
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr ""
@@ -394,7 +388,7 @@ msgstr ""
 msgid "Use this form to manage user records in your database."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:268
+#: lib/mv_web/live/user_live/form.ex:266
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -422,7 +416,8 @@ msgstr ""
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/member_live/form.ex:241
+#: lib/mv_web/live/user_live/form.ex:265
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
@@ -498,30 +493,29 @@ msgid "User will be created without a password. Check 'Set Password' to add one.
 msgstr ""
 
 #: lib/mv_web/live/user_live/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/index.html.heex:53
+#: lib/mv_web/live/user_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:63
+#: lib/mv_web/live/member_live/show.ex:106
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:56
-#: lib/mv_web/live/user_live/show.ex:63
+#: lib/mv_web/live/user_live/index.html.heex:57
+#: lib/mv_web/live/user_live/show.ex:65
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:73
+#: lib/mv_web/live/member_live/show.ex:116
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:37
-#: lib/mv_web/live/member_live/show.ex:39
+#: lib/mv_web/live/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr ""
@@ -532,14 +526,14 @@ msgstr ""
 msgid "Back to users list"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:44
-#: lib/mv_web/components/layouts/navbar.ex:50
+#: lib/mv_web/components/layouts/navbar.ex:33
+#: lib/mv_web/components/layouts/navbar.ex:39
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:57
-#: lib/mv_web/components/layouts/navbar.ex:77
+#: lib/mv_web/components/layouts/navbar.ex:46
+#: lib/mv_web/components/layouts/navbar.ex:66
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr ""
@@ -602,12 +596,6 @@ msgstr ""
 msgid "Choose a custom field"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:78
-#, elixir-autogen, elixir-format
-msgid "Custom Field Values"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_value_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Custom field"
@@ -644,6 +632,8 @@ msgid "Use this form to manage custom_field records in your database."
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/live/member_live/form.ex:135
+#: lib/mv_web/live/member_live/show.ex:136
 #, elixir-autogen, elixir-format
 msgid "Custom Fields"
 msgstr ""
@@ -711,7 +701,6 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:102
 #: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format
 msgid "Save Settings"
@@ -732,7 +721,7 @@ msgstr ""
 msgid "Available members"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:359
+#: lib/mv_web/live/user_live/form.ex:357
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr ""
@@ -772,7 +761,7 @@ msgstr ""
 msgid "Unlinking scheduled"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:160
+#: lib/mv_web/live/member_live/index.ex:159
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -789,12 +778,12 @@ msgstr ""
 msgid "Copy emails"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:149
+#: lib/mv_web/live/member_live/index.ex:148
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:146
+#: lib/mv_web/live/member_live/index.ex:145
 #, elixir-autogen, elixir-format
 msgid "No members selected"
 msgstr ""
@@ -809,16 +798,11 @@ msgstr ""
 msgid "Open in email program"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:169
+#: lib/mv_web/live/member_live/index.ex:168
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:40
-#, elixir-autogen, elixir-format
-msgid "Fields marked with an asterisk (*) cannot be empty."
-msgstr ""
-
 #: lib/mv_web/components/core_components.ex:206
 #: lib/mv_web/components/core_components.ex:223
 #: lib/mv_web/components/core_components.ex:250
@@ -849,428 +833,93 @@ msgstr ""
 msgid "Payment filter"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:107
+#: lib/mv_web/live/member_live/show.ex:70
 #, elixir-autogen, elixir-format
-msgid "%{count} period selected"
-msgid_plural "%{count} periods selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:113
-#, elixir-autogen, elixir-format
-msgid "About Contribution Types"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:138
-#: lib/mv_web/live/contribution_type_live/index.ex:53
-#, elixir-autogen, elixir-format
-msgid "Amount"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:48
-#, elixir-autogen, elixir-format
-msgid "Back to Settings"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:124
-#, elixir-autogen, elixir-format
-msgid "Can be changed at any time. Amount changes affect future periods only."
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:77
-#, elixir-autogen, elixir-format
-msgid "Cannot delete - members assigned"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:83
-#, elixir-autogen, elixir-format
-msgid "Change Contribution Type"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:42
-#, elixir-autogen, elixir-format
-msgid "Configure global settings for membership contributions."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex:34
-#: lib/mv_web/live/contribution_settings_live.ex:27
-#: lib/mv_web/live/contribution_settings_live.ex:40
-#, elixir-autogen, elixir-format
-msgid "Contribution Settings"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:62
-#, elixir-autogen, elixir-format
-msgid "Contribution Start"
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex:32
-#: lib/mv_web/live/contribution_type_live/index.ex:25
-#: lib/mv_web/live/contribution_type_live/index.ex:36
-#, elixir-autogen, elixir-format
-msgid "Contribution Types"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:224
-#, elixir-autogen, elixir-format
-msgid "Contribution start"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:41
-#, elixir-autogen, elixir-format
-msgid "Contribution type"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:117
-#, elixir-autogen, elixir-format
-msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex:30
-#, elixir-autogen, elixir-format
-msgid "Contributions"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:39
-#, elixir-autogen, elixir-format
-msgid "Contributions for %{name}"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:159
-#, elixir-autogen, elixir-format
-msgid "Current"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:60
-#, elixir-autogen, elixir-format
-msgid "Default Contribution Type"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:133
-#, elixir-autogen, elixir-format
-msgid "Deletion"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:173
-#, elixir-autogen, elixir-format
-msgid "Example: Member Contribution View"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:113
-#, elixir-autogen, elixir-format
-msgid "Examples"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:262
-#: lib/mv_web/live/contribution_type_live/index.ex:172
-#, elixir-autogen, elixir-format
-msgid "Family"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:128
-#, elixir-autogen, elixir-format
-msgid "Fixed after creation. Members can only switch between types with the same interval."
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:228
-#, elixir-autogen, elixir-format
-msgid "Generated periods"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:52
-#, elixir-autogen, elixir-format
-msgid "Global Settings"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:343
-#: lib/mv_web/live/contribution_settings_live.ex:275
-#: lib/mv_web/live/contribution_type_live/index.ex:203
-#, elixir-autogen, elixir-format
-msgid "Half-yearly"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:181
-#, elixir-autogen, elixir-format
-msgid "Half-yearly contribution for supporting members"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_type_live/index.ex:188
-#, elixir-autogen, elixir-format
-msgid "Honorary"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:85
-#, elixir-autogen, elixir-format
-msgid "Include joining period"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:137
-#: lib/mv_web/live/contribution_type_live/index.ex:57
-#: lib/mv_web/live/contribution_type_live/index.ex:127
-#, elixir-autogen, elixir-format
-msgid "Interval"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:220
-#, elixir-autogen, elixir-format
-msgid "Joining date"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:331
-#, elixir-autogen, elixir-format
-msgid "Joining year - reduced to 0"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:38
-#, elixir-autogen, elixir-format
-msgid "Manage contribution types for membership fees."
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:116
-#, elixir-autogen, elixir-format
-msgid "Mark as Paid"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:120
-#, elixir-autogen, elixir-format
-msgid "Mark as Suspended"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:124
-#, elixir-autogen, elixir-format
-msgid "Mark as Unpaid"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:26
-#, elixir-autogen, elixir-format
-msgid "Member Contributions"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:122
-#, elixir-autogen, elixir-format
-msgid "Member pays for the year they joined"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:155
-#, elixir-autogen, elixir-format
-msgid "Member pays from the joining month"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:144
-#, elixir-autogen, elixir-format
-msgid "Member pays from the next full quarter"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:133
-#, elixir-autogen, elixir-format
-msgid "Member pays from the next full year"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:43
-#, elixir-autogen, elixir-format
-msgid "Member since"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:92
-#, elixir-autogen, elixir-format
-msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:341
-#: lib/mv_web/live/contribution_settings_live.ex:273
-#: lib/mv_web/live/contribution_type_live/index.ex:201
-#, elixir-autogen, elixir-format
-msgid "Monthly"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:150
-#, elixir-autogen, elixir-format
-msgid "Monthly Interval - Joining Period Included"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:165
-#, elixir-autogen, elixir-format
-msgid "Monthly fee for students and trainees"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:123
-#, elixir-autogen, elixir-format
-msgid "Name & Amount"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:42
-#, elixir-autogen, elixir-format
-msgid "New Contribution Type"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:189
-#, elixir-autogen, elixir-format
-msgid "No fee for honorary members"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:134
-#, elixir-autogen, elixir-format
-msgid "Only possible if no members are assigned to this type."
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:70
-#, elixir-autogen, elixir-format
-msgid "Open Contributions"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:301
-#, elixir-autogen, elixir-format
-msgid "Paid via bank transfer"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:225
-#: lib/mv_web/live/contribution_settings_live.ex:197
-#: lib/mv_web/live/contribution_type_live/index.ex:97
-#, elixir-autogen, elixir-format
-msgid "Preview Mockup"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:342
-#: lib/mv_web/live/contribution_settings_live.ex:274
-#: lib/mv_web/live/contribution_type_live/index.ex:202
-#, elixir-autogen, elixir-format
-msgid "Quarterly"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:139
-#, elixir-autogen, elixir-format
-msgid "Quarterly Interval - Joining Period Excluded"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:173
-#, elixir-autogen, elixir-format
-msgid "Quarterly fee for family memberships"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:86
-#: lib/mv_web/live/contribution_settings_live.ex:250
-#: lib/mv_web/live/contribution_type_live/index.ex:156
-#, elixir-autogen, elixir-format
-msgid "Reduced"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:157
-#, elixir-autogen, elixir-format
-msgid "Reduced fee for unemployed, pensioners, or low income"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:275
-#: lib/mv_web/live/contribution_settings_live.ex:244
-#: lib/mv_web/live/contribution_type_live/index.ex:148
-#, elixir-autogen, elixir-format
-msgid "Regular"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:204
-#, elixir-autogen, elixir-format
-msgid "Reopen"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:176
-#, elixir-autogen, elixir-format
-msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:149
-#, elixir-autogen, elixir-format
-msgid "Standard membership fee for regular members"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:139
-#, elixir-autogen, elixir-format
-msgid "Status"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:256
-#: lib/mv_web/live/contribution_type_live/index.ex:164
-#, elixir-autogen, elixir-format
-msgid "Student"
+msgid "Address"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:180
+#: lib/mv_web/live/member_live/form.ex:37
+#: lib/mv_web/live/member_live/show.ex:32
 #, elixir-autogen, elixir-format
-msgid "Supporting Member"
+msgid "Back"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:195
+#: lib/mv_web/live/member_live/form.ex:65
+#: lib/mv_web/live/member_live/show.ex:50
 #, elixir-autogen, elixir-format
-msgid "Suspend"
+msgid "Coming soon"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:259
+#: lib/mv_web/live/member_live/form.ex:57
+#: lib/mv_web/live/member_live/show.ex:48
 #, elixir-autogen, elixir-format
-msgid "Suspended"
+msgid "Contact Data"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:69
+#: lib/mv_web/live/member_live/form.ex:175
+#: lib/mv_web/live/member_live/show.ex:160
 #, elixir-autogen, elixir-format
-msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
+msgid "Contribution"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:227
-#: lib/mv_web/live/contribution_settings_live.ex:199
-#: lib/mv_web/live/contribution_type_live/index.ex:99
+#: lib/mv_web/live/member_live/form.ex:94
 #, elixir-autogen, elixir-format
-msgid "This page is not functional and only displays the planned features."
+msgid "Nr."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:136
+#: lib/mv_web/live/member_live/form.ex:186
+#: lib/mv_web/live/member_live/show.ex:161
 #, elixir-autogen, elixir-format
-msgid "Time Period"
+msgid "Payment Cycle"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:66
+#: lib/mv_web/live/member_live/form.ex:166
+#: lib/mv_web/live/member_live/show.ex:153
 #, elixir-autogen, elixir-format
-msgid "Total Contributions"
+msgid "Payment Data"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:250
+#: lib/mv_web/live/member_live/form.ex:68
+#: lib/mv_web/live/member_live/show.ex:52
 #, elixir-autogen, elixir-format
-msgid "Unpaid"
+msgid "Payments"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:183
+#: lib/mv_web/live/member_live/show.ex:166
 #, elixir-autogen, elixir-format
-msgid "View Example Member"
+msgid "Pending"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:90
+#: lib/mv_web/live/member_live/form.ex:76
+#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
-msgid "When active: Members pay from the period of their joining."
+msgid "Personal Data"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:93
+#: lib/mv_web/live/member_live/form.ex:111
+#: lib/mv_web/live/member_live/show.ex:87
 #, elixir-autogen, elixir-format
-msgid "When inactive: Members pay from the next full period after joining."
+msgid "Phone"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:98
+#: lib/mv_web/live/member_live/form.ex:49
 #, elixir-autogen, elixir-format
-msgid "Why are not all contribution types shown?"
+msgid "Save"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:85
-#: lib/mv_web/live/contribution_period_live/show.ex:86
-#: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_period_live/show.ex:344
-#: lib/mv_web/live/contribution_settings_live.ex:276
-#: lib/mv_web/live/contribution_type_live/index.ex:204
+#: lib/mv_web/live/member_live/form.ex:169
+#: lib/mv_web/live/member_live/show.ex:156
 #, elixir-autogen, elixir-format
-msgid "Yearly"
+msgid "This data is for demonstration purposes only (mockup)."
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:128
+#: lib/mv_web/live/member_live/form.ex:190
+#: lib/mv_web/live/member_live/show.ex:161
 #, elixir-autogen, elixir-format
-msgid "Yearly Interval - Joining Period Excluded"
+msgid "monthly"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:117
+#: lib/mv_web/live/member_live/form.ex:194
 #, elixir-autogen, elixir-format
-msgid "Yearly Interval - Joining Period Included"
+msgid "yearly"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index ceee74a..9cb10a3 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -11,14 +11,13 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/mv_web/components/core_components.ex:387
-#: lib/mv_web/live/contribution_period_live/show.ex:141
+#: lib/mv_web/components/core_components.ex:386
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:71
+#: lib/mv_web/live/user_live/index.html.heex:72
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
@@ -29,71 +28,69 @@ msgstr ""
 msgid "Attempting to reconnect"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:53
+#: lib/mv_web/live/member_live/form.ex:100
 #: lib/mv_web/live/member_live/index.html.heex:184
-#: lib/mv_web/live/member_live/show.ex:59
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:73
+#: lib/mv_web/live/user_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:66
+#: lib/mv_web/live/member_live/form.ex:241
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:267
-#: lib/mv_web/live/user_live/index.html.heex:65
+#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:42
-#: lib/mv_web/live/member_live/show.ex:114
+#: lib/mv_web/live/member_live/show.ex:40
+#: lib/mv_web/live/member_live/show.ex:197
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:58
-#: lib/mv_web/live/member_live/form.ex:47
+#: lib/mv_web/live/member_live/form.ex:106
 #: lib/mv_web/live/member_live/index.html.heex:112
-#: lib/mv_web/live/member_live/show.ex:51
+#: lib/mv_web/live/member_live/show.ex:75
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:49
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:45
-#: lib/mv_web/live/member_live/show.ex:49
+#: lib/mv_web/live/member_live/form.ex:81
+#: lib/mv_web/live/member_live/show.ex:64
 #, elixir-autogen, elixir-format
 msgid "First Name"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:50
+#: lib/mv_web/live/member_live/form.ex:117
 #: lib/mv_web/live/member_live/index.html.heex:220
-#: lib/mv_web/live/member_live/show.ex:56
+#: lib/mv_web/live/member_live/show.ex:93
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:46
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/form.ex:84
+#: lib/mv_web/live/member_live/show.ex:65
 #, elixir-autogen, elixir-format
 msgid "Last Name"
 msgstr ""
 
+#: lib/mv_web/live/member_live/form.ex:44
 #: lib/mv_web/live/member_live/index.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "New Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:62
+#: lib/mv_web/live/user_live/index.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
@@ -113,52 +110,45 @@ msgstr ""
 msgid "close"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:51
-#: lib/mv_web/live/member_live/show.ex:57
+#: lib/mv_web/live/member_live/form.ex:120
+#: lib/mv_web/live/member_live/show.ex:98
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:55
 #: lib/mv_web/live/member_live/index.html.heex:148
-#: lib/mv_web/live/member_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:140
-#: lib/mv_web/live/member_live/form.ex:52
-#: lib/mv_web/live/member_live/show.ex:58
+#: lib/mv_web/live/member_live/form.ex:126
+#: lib/mv_web/live/member_live/show.ex:124
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
-#: lib/mv_web/live/contribution_period_live/show.ex:186
-#: lib/mv_web/live/contribution_period_live/show.ex:241
-#: lib/mv_web/live/member_live/form.ex:48
+#: lib/mv_web/live/member_live/form.ex:199
 #: lib/mv_web/live/member_live/index.html.heex:229
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/show.ex:162
+#: lib/mv_web/live/member_live/show.ex:164
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:49
 #: lib/mv_web/live/member_live/index.html.heex:202
-#: lib/mv_web/live/member_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:56
+#: lib/mv_web/live/member_live/form.ex:97
 #: lib/mv_web/live/member_live/index.html.heex:166
-#: lib/mv_web/live/member_live/show.ex:62
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:79
+#: lib/mv_web/live/member_live/form.ex:211
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Member"
 msgstr ""
@@ -166,58 +156,48 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/form.ex:66
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
 #: lib/mv_web/live/global_settings_live.ex:55
-#: lib/mv_web/live/member_live/form.ex:78
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/member_live/form.ex:48
+#: lib/mv_web/live/member_live/form.ex:210
+#: lib/mv_web/live/user_live/form.ex:248
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:54
+#: lib/mv_web/live/member_live/form.ex:91
 #: lib/mv_web/live/member_live/index.html.heex:130
-#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:48
-#, elixir-autogen, elixir-format
-msgid "Id"
-msgstr ""
-
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:62
-#: lib/mv_web/live/member_live/show.ex:53
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:303
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:113
+#: lib/mv_web/live/member_live/show.ex:196
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:34
-#, elixir-autogen, elixir-format
-msgid "This is a member record from your database."
-msgstr ""
-
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:53
+#: lib/mv_web/live/member_live/index/formatter.ex:60
+#: lib/mv_web/live/member_live/show.ex:303
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
 
 #: lib/mv_web/live/custom_field_live/form.ex:110
 #: lib/mv_web/live/custom_field_value_live/form.ex:233
-#: lib/mv_web/live/member_live/form.ex:137
+#: lib/mv_web/live/member_live/form.ex:269
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
 #: lib/mv_web/live/custom_field_live/form.ex:111
 #: lib/mv_web/live/custom_field_value_live/form.ex:234
-#: lib/mv_web/live/member_live/form.ex:138
+#: lib/mv_web/live/member_live/form.ex:270
 #, elixir-autogen, elixir-format
 msgid "update"
 msgstr ""
@@ -227,7 +207,7 @@ msgstr ""
 msgid "Incorrect email or password"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:144
+#: lib/mv_web/live/member_live/form.ex:276
 #, elixir-autogen, elixir-format
 msgid "Member %{action} successfully"
 msgstr ""
@@ -260,8 +240,8 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/form.ex:69
 #: lib/mv_web/live/custom_field_live/index.ex:120
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
-#: lib/mv_web/live/member_live/form.ex:81
-#: lib/mv_web/live/user_live/form.ex:252
+#: lib/mv_web/live/member_live/form.ex:208
+#: lib/mv_web/live/user_live/form.ex:251
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
@@ -281,17 +261,22 @@ msgstr ""
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:51
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
+#: lib/mv_web/live/user_live/show.ex:49
+#, elixir-autogen, elixir-format
+msgid "ID"
+msgstr ""
+
 #: lib/mv_web/live/custom_field_live/form.ex:62
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:113
+#: lib/mv_web/components/layouts/navbar.ex:102
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
@@ -303,19 +288,18 @@ msgid "Listing Users"
 msgstr ""
 
 #: lib/mv_web/live/custom_field_value_live/form.ex:60
+#: lib/mv_web/live/member_live/form.ex:242
 #, elixir-autogen, elixir-format
 msgid "Member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/contribution_type_live/index.ex:61
-#: lib/mv_web/live/member_live/index.ex:74
+#: lib/mv_web/live/member_live/index.ex:73
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:48
 #: lib/mv_web/live/custom_field_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -326,12 +310,16 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:51
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:207
+#: lib/mv_web/live/user_live/show.ex:51
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Not set"
+msgstr ""
+
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -339,12 +327,18 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:51
+#, elixir-autogen, elixir-format
+msgid "OIDC ID"
+msgstr ""
+
+#: lib/mv_web/live/user_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:106
+#: lib/mv_web/components/layouts/navbar.ex:95
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
@@ -364,17 +358,17 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:110
+#: lib/mv_web/components/layouts/navbar.ex:99
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:250
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:77
+#: lib/mv_web/live/user_live/show.ex:79
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show User"
 msgstr ""
@@ -394,7 +388,7 @@ msgstr ""
 msgid "Use this form to manage user records in your database."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:268
+#: lib/mv_web/live/user_live/form.ex:266
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -422,7 +416,8 @@ msgstr ""
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/member_live/form.ex:241
+#: lib/mv_web/live/user_live/form.ex:265
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
@@ -498,30 +493,29 @@ 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/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/index.html.heex:53
+#: lib/mv_web/live/user_live/show.ex:55
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Linked Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:63
+#: lib/mv_web/live/member_live/show.ex:106
 #, elixir-autogen, elixir-format
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:56
-#: lib/mv_web/live/user_live/show.ex:63
+#: lib/mv_web/live/user_live/index.html.heex:57
+#: lib/mv_web/live/user_live/show.ex:65
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:73
+#: lib/mv_web/live/member_live/show.ex:116
 #, elixir-autogen, elixir-format
 msgid "No user linked"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:37
-#: lib/mv_web/live/member_live/show.ex:39
+#: lib/mv_web/live/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Back to members list"
 msgstr ""
@@ -532,14 +526,14 @@ msgstr ""
 msgid "Back to users list"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:44
-#: lib/mv_web/components/layouts/navbar.ex:50
+#: lib/mv_web/components/layouts/navbar.ex:33
+#: lib/mv_web/components/layouts/navbar.ex:39
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Select language"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:57
-#: lib/mv_web/components/layouts/navbar.ex:77
+#: lib/mv_web/components/layouts/navbar.ex:46
+#: lib/mv_web/components/layouts/navbar.ex:66
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr ""
@@ -602,12 +596,6 @@ msgstr ""
 msgid "Choose a custom field"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:58
-#: lib/mv_web/live/member_live/show.ex:78
-#, elixir-autogen, elixir-format
-msgid "Custom Field Values"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_value_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Custom field"
@@ -644,6 +632,8 @@ msgid "Use this form to manage custom_field records in your database."
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/live/member_live/form.ex:135
+#: lib/mv_web/live/member_live/show.ex:136
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Custom Fields"
 msgstr ""
@@ -711,7 +701,6 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:102
 #: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
@@ -732,7 +721,7 @@ msgstr ""
 msgid "Available members"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:359
+#: lib/mv_web/live/user_live/form.ex:357
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr ""
@@ -772,7 +761,7 @@ msgstr ""
 msgid "Unlinking scheduled"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:160
+#: lib/mv_web/live/member_live/index.ex:159
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -789,12 +778,12 @@ msgstr ""
 msgid "Copy emails"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:149
+#: lib/mv_web/live/member_live/index.ex:148
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:146
+#: lib/mv_web/live/member_live/index.ex:145
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No members selected"
 msgstr ""
@@ -809,16 +798,11 @@ msgstr ""
 msgid "Open in email program"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:169
+#: lib/mv_web/live/member_live/index.ex:168
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:40
-#, elixir-autogen, elixir-format
-msgid "Fields marked with an asterisk (*) cannot be empty."
-msgstr ""
-
 #: lib/mv_web/components/core_components.ex:206
 #: lib/mv_web/components/core_components.ex:223
 #: lib/mv_web/components/core_components.ex:250
@@ -849,456 +833,103 @@ msgstr ""
 msgid "Payment filter"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:107
+#: lib/mv_web/live/member_live/show.ex:70
 #, elixir-autogen, elixir-format
-msgid "%{count} period selected"
-msgid_plural "%{count} periods selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:113
-#, elixir-autogen, elixir-format
-msgid "About Contribution Types"
+msgid "Address"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:138
-#: lib/mv_web/live/contribution_type_live/index.ex:53
+#: lib/mv_web/live/member_live/form.ex:37
+#: lib/mv_web/live/member_live/show.ex:32
 #, elixir-autogen, elixir-format
-msgid "Amount"
+msgid "Back"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:48
+#: lib/mv_web/live/member_live/form.ex:65
+#: lib/mv_web/live/member_live/show.ex:50
 #, elixir-autogen, elixir-format
-msgid "Back to Settings"
+msgid "Coming soon"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:124
+#: lib/mv_web/live/member_live/form.ex:57
+#: lib/mv_web/live/member_live/show.ex:48
 #, elixir-autogen, elixir-format
-msgid "Can be changed at any time. Amount changes affect future periods only."
+msgid "Contact Data"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:77
+#: lib/mv_web/live/member_live/form.ex:175
+#: lib/mv_web/live/member_live/show.ex:160
 #, elixir-autogen, elixir-format
-msgid "Cannot delete - members assigned"
+msgid "Contribution"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:83
+#: lib/mv_web/live/member_live/form.ex:94
 #, elixir-autogen, elixir-format
-msgid "Change Contribution Type"
+msgid "Nr."
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:42
-#, elixir-autogen, elixir-format
-msgid "Configure global settings for membership contributions."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex:34
-#: lib/mv_web/live/contribution_settings_live.ex:27
-#: lib/mv_web/live/contribution_settings_live.ex:40
-#, elixir-autogen, elixir-format
-msgid "Contribution Settings"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:62
-#, elixir-autogen, elixir-format
-msgid "Contribution Start"
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex:32
-#: lib/mv_web/live/contribution_type_live/index.ex:25
-#: lib/mv_web/live/contribution_type_live/index.ex:36
-#, elixir-autogen, elixir-format
-msgid "Contribution Types"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:224
-#, elixir-autogen, elixir-format
-msgid "Contribution start"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:41
-#, elixir-autogen, elixir-format
-msgid "Contribution type"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:117
-#, elixir-autogen, elixir-format
-msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex:30
-#, elixir-autogen, elixir-format
-msgid "Contributions"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:39
-#, elixir-autogen, elixir-format
-msgid "Contributions for %{name}"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:159
-#, elixir-autogen, elixir-format
-msgid "Current"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:60
-#, elixir-autogen, elixir-format
-msgid "Default Contribution Type"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:133
+#: lib/mv_web/live/member_live/form.ex:186
+#: lib/mv_web/live/member_live/show.ex:161
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Deletion"
+msgid "Payment Cycle"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:173
+#: lib/mv_web/live/member_live/form.ex:166
+#: lib/mv_web/live/member_live/show.ex:153
 #, elixir-autogen, elixir-format
-msgid "Example: Member Contribution View"
+msgid "Payment Data"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:113
+#: lib/mv_web/live/member_live/form.ex:68
+#: lib/mv_web/live/member_live/show.ex:52
 #, elixir-autogen, elixir-format
-msgid "Examples"
+msgid "Payments"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:262
-#: lib/mv_web/live/contribution_type_live/index.ex:172
-#, elixir-autogen, elixir-format
-msgid "Family"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:128
-#, elixir-autogen, elixir-format
-msgid "Fixed after creation. Members can only switch between types with the same interval."
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:228
-#, elixir-autogen, elixir-format
-msgid "Generated periods"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:52
+#: lib/mv_web/live/member_live/show.ex:166
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Global Settings"
+msgid "Pending"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:343
-#: lib/mv_web/live/contribution_settings_live.ex:275
-#: lib/mv_web/live/contribution_type_live/index.ex:203
+#: lib/mv_web/live/member_live/form.ex:76
+#: lib/mv_web/live/member_live/show.ex:60
 #, elixir-autogen, elixir-format
-msgid "Half-yearly"
+msgid "Personal Data"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:181
-#, elixir-autogen, elixir-format
-msgid "Half-yearly contribution for supporting members"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_type_live/index.ex:188
-#, elixir-autogen, elixir-format
-msgid "Honorary"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:85
-#, elixir-autogen, elixir-format
-msgid "Include joining period"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:137
-#: lib/mv_web/live/contribution_type_live/index.ex:57
-#: lib/mv_web/live/contribution_type_live/index.ex:127
-#, elixir-autogen, elixir-format
-msgid "Interval"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:220
+#: lib/mv_web/live/member_live/form.ex:111
+#: lib/mv_web/live/member_live/show.ex:87
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Joining date"
+msgid "Phone"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:331
-#, elixir-autogen, elixir-format
-msgid "Joining year - reduced to 0"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:38
-#, elixir-autogen, elixir-format
-msgid "Manage contribution types for membership fees."
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:116
-#, elixir-autogen, elixir-format
-msgid "Mark as Paid"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:120
-#, elixir-autogen, elixir-format
-msgid "Mark as Suspended"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:124
-#, elixir-autogen, elixir-format
-msgid "Mark as Unpaid"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:26
-#, elixir-autogen, elixir-format
-msgid "Member Contributions"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:122
-#, elixir-autogen, elixir-format
-msgid "Member pays for the year they joined"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:155
-#, elixir-autogen, elixir-format
-msgid "Member pays from the joining month"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:144
-#, elixir-autogen, elixir-format
-msgid "Member pays from the next full quarter"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:133
-#, elixir-autogen, elixir-format
-msgid "Member pays from the next full year"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:43
+#: lib/mv_web/live/member_live/form.ex:49
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Member since"
+msgid "Save"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:92
+#: lib/mv_web/live/member_live/form.ex:169
+#: lib/mv_web/live/member_live/show.ex:156
 #, elixir-autogen, elixir-format
-msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
+msgid "This data is for demonstration purposes only (mockup)."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:341
-#: lib/mv_web/live/contribution_settings_live.ex:273
-#: lib/mv_web/live/contribution_type_live/index.ex:201
+#: lib/mv_web/live/member_live/form.ex:190
+#: lib/mv_web/live/member_live/show.ex:161
 #, elixir-autogen, elixir-format
-msgid "Monthly"
+msgid "monthly"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:150
+#: lib/mv_web/live/member_live/form.ex:194
 #, elixir-autogen, elixir-format
-msgid "Monthly Interval - Joining Period Included"
+msgid "yearly"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:165
-#, elixir-autogen, elixir-format
-msgid "Monthly fee for students and trainees"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:123
-#, elixir-autogen, elixir-format
-msgid "Name & Amount"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:42
-#, elixir-autogen, elixir-format
-msgid "New Contribution Type"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:189
-#, elixir-autogen, elixir-format
-msgid "No fee for honorary members"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:134
-#, elixir-autogen, elixir-format
-msgid "Only possible if no members are assigned to this type."
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:70
-#, elixir-autogen, elixir-format
-msgid "Open Contributions"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:301
-#, elixir-autogen, elixir-format
-msgid "Paid via bank transfer"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:225
-#: lib/mv_web/live/contribution_settings_live.ex:197
-#: lib/mv_web/live/contribution_type_live/index.ex:97
-#, elixir-autogen, elixir-format
-msgid "Preview Mockup"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:342
-#: lib/mv_web/live/contribution_settings_live.ex:274
-#: lib/mv_web/live/contribution_type_live/index.ex:202
-#, elixir-autogen, elixir-format
-msgid "Quarterly"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:139
-#, elixir-autogen, elixir-format
-msgid "Quarterly Interval - Joining Period Excluded"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:173
-#, elixir-autogen, elixir-format
-msgid "Quarterly fee for family memberships"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:86
-#: lib/mv_web/live/contribution_settings_live.ex:250
-#: lib/mv_web/live/contribution_type_live/index.ex:156
-#, elixir-autogen, elixir-format
-msgid "Reduced"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:157
-#, elixir-autogen, elixir-format
-msgid "Reduced fee for unemployed, pensioners, or low income"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:275
-#: lib/mv_web/live/contribution_settings_live.ex:244
-#: lib/mv_web/live/contribution_type_live/index.ex:148
-#, elixir-autogen, elixir-format
-msgid "Regular"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:204
-#, elixir-autogen, elixir-format
-msgid "Reopen"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:176
-#, elixir-autogen, elixir-format
-msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:149
-#, elixir-autogen, elixir-format
-msgid "Standard membership fee for regular members"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:139
-#, elixir-autogen, elixir-format
-msgid "Status"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:256
-#: lib/mv_web/live/contribution_type_live/index.ex:164
-#, elixir-autogen, elixir-format
-msgid "Student"
-msgstr ""
-
-#: lib/mv_web/live/contribution_type_live/index.ex:180
-#, elixir-autogen, elixir-format
-msgid "Supporting Member"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:195
-#, elixir-autogen, elixir-format
-msgid "Suspend"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:259
-#, elixir-autogen, elixir-format
-msgid "Suspended"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:69
-#, elixir-autogen, elixir-format
-msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:227
-#: lib/mv_web/live/contribution_settings_live.ex:199
-#: lib/mv_web/live/contribution_type_live/index.ex:99
-#, elixir-autogen, elixir-format
-msgid "This page is not functional and only displays the planned features."
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:136
-#, elixir-autogen, elixir-format
-msgid "Time Period"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:66
-#, elixir-autogen, elixir-format
-msgid "Total Contributions"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:250
-#, elixir-autogen, elixir-format
-msgid "Unpaid"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:183
-#, elixir-autogen, elixir-format
-msgid "View Example Member"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:90
-#, elixir-autogen, elixir-format
-msgid "When active: Members pay from the period of their joining."
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:93
-#, elixir-autogen, elixir-format
-msgid "When inactive: Members pay from the next full period after joining."
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:98
-#, elixir-autogen, elixir-format
-msgid "Why are not all contribution types shown?"
-msgstr ""
-
-#: lib/mv_web/live/contribution_period_live/show.ex:85
-#: lib/mv_web/live/contribution_period_live/show.ex:86
-#: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_period_live/show.ex:344
-#: lib/mv_web/live/contribution_settings_live.ex:276
-#: lib/mv_web/live/contribution_type_live/index.ex:204
-#, elixir-autogen, elixir-format
-msgid "Yearly"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:128
-#, elixir-autogen, elixir-format
-msgid "Yearly Interval - Joining Period Excluded"
-msgstr ""
-
-#: lib/mv_web/live/contribution_settings_live.ex:117
-#, elixir-autogen, elixir-format
-msgid "Yearly Interval - Joining Period Included"
-msgstr ""
-
-#~ #: lib/mv_web/live/member_live/form.ex:48
-#~ #: lib/mv_web/live/member_live/show.ex:51
+#~ #: lib/mv_web/live/member_live/show.ex:47
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Birth Date"
+#~ msgid "Id"
 #~ msgstr ""
 
-#~ #: lib/mv_web/live/user_live/show.ex:49
+#~ #: lib/mv_web/live/member_live/show.ex:33
 #~ #, elixir-autogen, elixir-format
-#~ msgid "ID"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/user_live/show.ex:51
-#~ #, elixir-autogen, elixir-format, fuzzy
-#~ msgid "Not set"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/user_live/index.html.heex:52
-#~ #: lib/mv_web/live/user_live/show.ex:51
-#~ #, elixir-autogen, elixir-format
-#~ msgid "OIDC ID"
-#~ msgstr ""
-
-#~ #: lib/mv_web/live/contribution_period_live/show.ex:273
-#~ #: lib/mv_web/live/contribution_settings_live.ex:248
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Related Pages"
+#~ msgid "This is a member record from your database."
 #~ msgstr ""

From 2542bcf9e44649462dfca70033cde8f6ed5611d2 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Wed, 3 Dec 2025 15:22:49 +0100
Subject: [PATCH 09/12] fix: improve gettext translations and deduplicate email
 formatting in member views

---
 lib/mv_web/live/member_live/form.ex    |   4 +-
 lib/mv_web/live/member_live/show.ex    |  19 +-
 priv/gettext/de/LC_MESSAGES/default.po | 552 ++++++++++++++++++++++---
 priv/gettext/default.pot               | 536 +++++++++++++++++++++---
 priv/gettext/en/LC_MESSAGES/default.po | 552 ++++++++++++++++++++++---
 5 files changed, 1477 insertions(+), 186 deletions(-)

diff --git a/lib/mv_web/live/member_live/form.ex b/lib/mv_web/live/member_live/form.ex
index 4781cd5..5380d0f 100644
--- a/lib/mv_web/live/member_live/form.ex
+++ b/lib/mv_web/live/member_live/form.ex
@@ -238,8 +238,8 @@ defmodule MvWeb.MemberLive.Form do
         id -> Ash.get!(Mv.Membership.Member, id)
       end
 
-    action = if is_nil(member), do: gettext("New"), else: gettext("Edit")
-    page_title = "#{action} #{gettext("Member")}"
+    page_title =
+      if is_nil(member), do: gettext("Create Member"), else: gettext("Edit Member")
 
     {:ok,
      socket
diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex
index 55d8991..d84fca4 100644
--- a/lib/mv_web/live/member_live/show.ex
+++ b/lib/mv_web/live/member_live/show.ex
@@ -74,7 +74,7 @@ defmodule MvWeb.MemberLive.Show do
               <div>
                 <.data_field label={gettext("Email")}>
                   <a
-                    href={"mailto:#{format_email_mailto(@member.first_name, @member.last_name, @member.email)}"}
+                    href={"mailto:#{MvWeb.MemberLive.Index.format_member_email(@member)}"}
                     class="text-blue-700 hover:text-blue-800 underline"
                   >
                     {@member.email}
@@ -240,23 +240,10 @@ defmodule MvWeb.MemberLive.Show do
   # Helper Functions
   # -----------------------------------------------------------------
 
-  defp display_value(nil), do: "—"
-  defp display_value(""), do: "—"
+  defp display_value(nil), do: ""
+  defp display_value(""), do: ""
   defp display_value(value), do: value
 
-  defp format_email_mailto(first_name, last_name, email) do
-    name =
-      [first_name, last_name]
-      |> Enum.filter(&(&1 && &1 != ""))
-      |> Enum.join(" ")
-
-    if name != "" do
-      "#{name} <#{email}>"
-    else
-      email
-    end
-  end
-
   defp format_address(member) do
     street_part =
       [member.street, member.house_number]
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index c6f2028..ac40975 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -10,13 +10,14 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex:387
+#: lib/mv_web/live/contribution_period_live/show.ex:141
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr "Aktionen"
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/user_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr "Bist du sicher?"
@@ -33,32 +34,35 @@ msgstr "Verbindung wird wiederhergestellt"
 msgid "City"
 msgstr "Stadt"
 
+#: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/user_live/index.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr "Löschen"
 
-#: lib/mv_web/live/member_live/form.ex:241
+#: lib/mv_web/live/contribution_type_live/index.ex:66
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/user_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr "Bearbeite"
 
+#: lib/mv_web/live/member_live/form.ex:242
 #: lib/mv_web/live/member_live/show.ex:40
 #: lib/mv_web/live/member_live/show.ex:197
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr "Mitglied bearbeiten"
 
+#: lib/mv_web/live/contribution_period_live/show.ex:58
 #: lib/mv_web/live/member_live/form.ex:106
 #: lib/mv_web/live/member_live/index.html.heex:112
 #: lib/mv_web/live/member_live/show.ex:75
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr "E-Mail"
@@ -89,7 +93,7 @@ msgid "New Member"
 msgstr "Neues Mitglied"
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/user_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr "Anzeigen"
@@ -120,6 +124,7 @@ msgstr "Austrittsdatum"
 msgid "House Number"
 msgstr "Hausnummer"
 
+#: lib/mv_web/live/contribution_period_live/show.ex:140
 #: lib/mv_web/live/member_live/form.ex:126
 #: lib/mv_web/live/member_live/show.ex:124
 #, elixir-autogen, elixir-format
@@ -128,6 +133,8 @@ msgstr "Notizen"
 
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
+#: lib/mv_web/live/contribution_period_live/show.ex:186
+#: lib/mv_web/live/contribution_period_live/show.ex:241
 #: lib/mv_web/live/member_live/form.ex:199
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/show.ex:162
@@ -157,7 +164,7 @@ msgstr "Mitglied speichern"
 #: lib/mv_web/live/global_settings_live.ex:55
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/form.ex:210
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Speichern..."
@@ -169,8 +176,8 @@ msgid "Street"
 msgstr "Straße"
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:303
+#: lib/mv_web/live/member_live/index/formatter.ex:62
+#: lib/mv_web/live/member_live/show.ex:290
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr "Nein"
@@ -181,8 +188,8 @@ msgid "Show Member"
 msgstr "Mitglied anzeigen"
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:303
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:290
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr "Ja"
@@ -240,7 +247,7 @@ msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt"
 #: lib/mv_web/live/custom_field_live/index.ex:120
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:208
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/user_live/form.ex:252
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -260,22 +267,17 @@ msgstr "Beschreibung"
 msgid "Edit User"
 msgstr "Benutzer*in bearbeiten"
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr "ID"
-
 #: lib/mv_web/live/custom_field_live/form.ex:62
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr "Unveränderlich"
 
-#: lib/mv_web/components/layouts/navbar.ex:102
+#: lib/mv_web/components/layouts/navbar.ex:113
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr "Abmelden"
@@ -287,18 +289,19 @@ msgid "Listing Users"
 msgstr "Benutzer*innen auflisten"
 
 #: lib/mv_web/live/custom_field_value_live/form.ex:60
-#: lib/mv_web/live/member_live/form.ex:242
 #, elixir-autogen, elixir-format
 msgid "Member"
 msgstr "Mitglied"
 
 #: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/member_live/index.ex:73
+#: lib/mv_web/live/contribution_type_live/index.ex:61
+#: lib/mv_web/live/member_live/index.ex:74
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr "Mitglieder"
 
+#: lib/mv_web/live/contribution_type_live/index.ex:48
 #: lib/mv_web/live/custom_field_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -309,16 +312,12 @@ msgstr "Name"
 msgid "New User"
 msgstr "Neue*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr "Nicht aktiviert"
 
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "Not set"
-msgstr "Nicht gesetzt"
-
+#: lib/mv_web/live/contribution_period_live/show.ex:207
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -326,18 +325,12 @@ msgstr "Nicht gesetzt"
 msgid "Note"
 msgstr "Hinweis"
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr "OIDC ID"
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr "Passwort-Authentifizierung"
 
-#: lib/mv_web/components/layouts/navbar.ex:95
+#: lib/mv_web/components/layouts/navbar.ex:106
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr "Profil"
@@ -357,17 +350,17 @@ msgstr "Alle Mitglieder auswählen"
 msgid "Select member"
 msgstr "Mitglied auswählen"
 
-#: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/components/layouts/navbar.ex:110
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex:250
 #, elixir-autogen, elixir-format
 msgid "Save User"
 msgstr "Benutzer*in speichern"
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr "Benutzer*in anzeigen"
@@ -387,7 +380,7 @@ msgstr "Nicht unterstützter Wertetyp: %{type}"
 msgid "Use this form to manage user records in your database."
 msgstr "Verwenden Sie dieses Formular, um Benutzer*innen-Datensätze zu verwalten."
 
-#: lib/mv_web/live/user_live/form.ex:266
+#: lib/mv_web/live/user_live/form.ex:268
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -415,8 +408,7 @@ msgstr "aufsteigend"
 msgid "descending"
 msgstr "absteigend"
 
-#: lib/mv_web/live/member_live/form.ex:241
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex:267
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr "Neue*r"
@@ -492,8 +484,8 @@ msgid "User will be created without a password. Check 'Set Password' to add one.
 msgstr "Benutzer*in wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen."
 
 #: lib/mv_web/live/user_live/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr "Verknüpftes Mitglied"
@@ -503,8 +495,8 @@ msgstr "Verknüpftes Mitglied"
 msgid "Linked User"
 msgstr "Verknüpfte*r Benutzer*in"
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex:56
+#: lib/mv_web/live/user_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr "Kein Mitglied verknüpft"
@@ -525,14 +517,14 @@ msgstr "Zurück zur Mitgliederliste"
 msgid "Back to users list"
 msgstr "Zurück zur Benutzer*innen-Liste"
 
-#: lib/mv_web/components/layouts/navbar.ex:33
-#: lib/mv_web/components/layouts/navbar.ex:39
+#: lib/mv_web/components/layouts/navbar.ex:44
+#: lib/mv_web/components/layouts/navbar.ex:50
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr "Sprache auswählen"
 
-#: lib/mv_web/components/layouts/navbar.ex:46
-#: lib/mv_web/components/layouts/navbar.ex:66
+#: lib/mv_web/components/layouts/navbar.ex:57
+#: lib/mv_web/components/layouts/navbar.ex:77
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr "Dunklen Modus umschalten"
@@ -700,6 +692,7 @@ msgstr "Vereinsdaten"
 msgid "Manage global settings for the association."
 msgstr "Passe übergreifende Einstellungen für den Verein an."
 
+#: lib/mv_web/live/contribution_settings_live.ex:102
 #: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
@@ -720,7 +713,7 @@ msgstr "Ein Mitglied mit dieser E-Mail-Adresse existiert bereits. Um mit einem a
 msgid "Available members"
 msgstr "Verfügbare Mitglieder"
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex:359
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr "Fehler beim Verlinken des Mitglieds: %{error}"
@@ -760,7 +753,7 @@ msgstr "Mitglied entverknüpfen"
 msgid "Unlinking scheduled"
 msgstr "Entverknüpfung geplant"
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex:160
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -777,12 +770,12 @@ msgstr "E-Mail-Adressen der ausgewählten Mitglieder kopieren"
 msgid "Copy emails"
 msgstr "E-Mails kopieren"
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex:149
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr "Keine E-Mail-Adressen gefunden"
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex:146
 #, elixir-autogen, elixir-format
 msgid "No members selected"
 msgstr "Keine Mitglieder ausgewählt"
@@ -797,7 +790,7 @@ msgstr "E-Mail-Programm mit BCC-Empfänger*innen öffnen"
 msgid "Open in email program"
 msgstr "Im E-Mail-Programm öffnen"
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex:169
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr "Tipp: E-Mail-Adressen ins BCC-Feld einfügen für Datenschutzkonformität"
@@ -923,11 +916,458 @@ msgstr "monatlich"
 msgid "yearly"
 msgstr "jährlich"
 
+#: lib/mv_web/live/member_live/form.ex:242
+#, elixir-autogen, elixir-format
+msgid "Create Member"
+msgstr "Mitglied erstellen"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:107
+#, elixir-autogen, elixir-format
+msgid "%{count} period selected"
+msgid_plural "%{count} periods selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:113
+#, elixir-autogen, elixir-format
+msgid "About Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:138
+#: lib/mv_web/live/contribution_type_live/index.ex:53
+#, elixir-autogen, elixir-format
+msgid "Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:48
+#, elixir-autogen, elixir-format
+msgid "Back to Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:124
+#, elixir-autogen, elixir-format
+msgid "Can be changed at any time. Amount changes affect future periods only."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:77
+#, elixir-autogen, elixir-format
+msgid "Cannot delete - members assigned"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:83
+#, elixir-autogen, elixir-format
+msgid "Change Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:42
+#, elixir-autogen, elixir-format
+msgid "Configure global settings for membership contributions."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:34
+#: lib/mv_web/live/contribution_settings_live.ex:27
+#: lib/mv_web/live/contribution_settings_live.ex:40
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution Settings"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:62
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution Start"
+msgstr "Beitrag"
+
+#: lib/mv_web/components/layouts/navbar.ex:32
+#: lib/mv_web/live/contribution_type_live/index.ex:25
+#: lib/mv_web/live/contribution_type_live/index.ex:36
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution Types"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_settings_live.ex:224
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution start"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:41
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution type"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:117
+#, elixir-autogen, elixir-format
+msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:30
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contributions"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:39
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contributions for %{name}"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:159
+#, elixir-autogen, elixir-format
+msgid "Current"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:60
+#, elixir-autogen, elixir-format
+msgid "Default Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:133
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Deletion"
+msgstr "Löschen"
+
+#: lib/mv_web/live/contribution_settings_live.ex:173
+#, elixir-autogen, elixir-format
+msgid "Example: Member Contribution View"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:113
+#, elixir-autogen, elixir-format
+msgid "Examples"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:262
+#: lib/mv_web/live/contribution_type_live/index.ex:172
+#, elixir-autogen, elixir-format
+msgid "Family"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:128
+#, elixir-autogen, elixir-format
+msgid "Fixed after creation. Members can only switch between types with the same interval."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:228
+#, elixir-autogen, elixir-format
+msgid "Generated periods"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:52
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Global Settings"
+msgstr "Vereinsdaten"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:343
+#: lib/mv_web/live/contribution_settings_live.ex:275
+#: lib/mv_web/live/contribution_type_live/index.ex:203
+#, elixir-autogen, elixir-format
+msgid "Half-yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:181
+#, elixir-autogen, elixir-format
+msgid "Half-yearly contribution for supporting members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_type_live/index.ex:188
+#, elixir-autogen, elixir-format
+msgid "Honorary"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:85
+#, elixir-autogen, elixir-format
+msgid "Include joining period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:137
+#: lib/mv_web/live/contribution_type_live/index.ex:57
+#: lib/mv_web/live/contribution_type_live/index.ex:127
+#, elixir-autogen, elixir-format
+msgid "Interval"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:220
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Joining date"
+msgstr "Beitrittsdatum"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:331
+#, elixir-autogen, elixir-format
+msgid "Joining year - reduced to 0"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:38
+#, elixir-autogen, elixir-format
+msgid "Manage contribution types for membership fees."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:116
+#, elixir-autogen, elixir-format
+msgid "Mark as Paid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:120
+#, elixir-autogen, elixir-format
+msgid "Mark as Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:124
+#, elixir-autogen, elixir-format
+msgid "Mark as Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:26
+#, elixir-autogen, elixir-format
+msgid "Member Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:122
+#, elixir-autogen, elixir-format
+msgid "Member pays for the year they joined"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:155
+#, elixir-autogen, elixir-format
+msgid "Member pays from the joining month"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:144
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full quarter"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:133
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full year"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:43
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Member since"
+msgstr "Mitglieder"
+
+#: lib/mv_web/live/contribution_period_live/show.ex:92
+#, elixir-autogen, elixir-format
+msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:341
+#: lib/mv_web/live/contribution_settings_live.ex:273
+#: lib/mv_web/live/contribution_type_live/index.ex:201
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Monthly"
+msgstr "monatlich"
+
+#: lib/mv_web/live/contribution_settings_live.ex:150
+#, elixir-autogen, elixir-format
+msgid "Monthly Interval - Joining Period Included"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:165
+#, elixir-autogen, elixir-format
+msgid "Monthly fee for students and trainees"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:123
+#, elixir-autogen, elixir-format
+msgid "Name & Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:42
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Contribution Type"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_type_live/index.ex:189
+#, elixir-autogen, elixir-format
+msgid "No fee for honorary members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:134
+#, elixir-autogen, elixir-format
+msgid "Only possible if no members are assigned to this type."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:70
+#, elixir-autogen, elixir-format
+msgid "Open Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:301
+#, elixir-autogen, elixir-format
+msgid "Paid via bank transfer"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:225
+#: lib/mv_web/live/contribution_settings_live.ex:197
+#: lib/mv_web/live/contribution_type_live/index.ex:97
+#, elixir-autogen, elixir-format
+msgid "Preview Mockup"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:342
+#: lib/mv_web/live/contribution_settings_live.ex:274
+#: lib/mv_web/live/contribution_type_live/index.ex:202
+#, elixir-autogen, elixir-format
+msgid "Quarterly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:139
+#, elixir-autogen, elixir-format
+msgid "Quarterly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:173
+#, elixir-autogen, elixir-format
+msgid "Quarterly fee for family memberships"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_settings_live.ex:250
+#: lib/mv_web/live/contribution_type_live/index.ex:156
+#, elixir-autogen, elixir-format
+msgid "Reduced"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:157
+#, elixir-autogen, elixir-format
+msgid "Reduced fee for unemployed, pensioners, or low income"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:275
+#: lib/mv_web/live/contribution_settings_live.ex:244
+#: lib/mv_web/live/contribution_type_live/index.ex:148
+#, elixir-autogen, elixir-format
+msgid "Regular"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:204
+#, elixir-autogen, elixir-format
+msgid "Reopen"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:176
+#, elixir-autogen, elixir-format
+msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:149
+#, elixir-autogen, elixir-format
+msgid "Standard membership fee for regular members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:139
+#, elixir-autogen, elixir-format
+msgid "Status"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:256
+#: lib/mv_web/live/contribution_type_live/index.ex:164
+#, elixir-autogen, elixir-format
+msgid "Student"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:180
+#, elixir-autogen, elixir-format
+msgid "Supporting Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:195
+#, elixir-autogen, elixir-format
+msgid "Suspend"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:259
+#, elixir-autogen, elixir-format
+msgid "Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:69
+#, elixir-autogen, elixir-format
+msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:227
+#: lib/mv_web/live/contribution_settings_live.ex:199
+#: lib/mv_web/live/contribution_type_live/index.ex:99
+#, elixir-autogen, elixir-format
+msgid "This page is not functional and only displays the planned features."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:136
+#, elixir-autogen, elixir-format
+msgid "Time Period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:66
+#, elixir-autogen, elixir-format
+msgid "Total Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:250
+#, elixir-autogen, elixir-format
+msgid "Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:183
+#, elixir-autogen, elixir-format
+msgid "View Example Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:90
+#, elixir-autogen, elixir-format
+msgid "When active: Members pay from the period of their joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:93
+#, elixir-autogen, elixir-format
+msgid "When inactive: Members pay from the next full period after joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:98
+#, elixir-autogen, elixir-format
+msgid "Why are not all contribution types shown?"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:85
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_period_live/show.ex:344
+#: lib/mv_web/live/contribution_settings_live.ex:276
+#: lib/mv_web/live/contribution_type_live/index.ex:204
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Yearly"
+msgstr "jährlich"
+
+#: lib/mv_web/live/contribution_settings_live.ex:128
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:117
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Included"
+msgstr ""
+
+#~ #: lib/mv_web/live/user_live/show.ex:49
+#~ #, elixir-autogen, elixir-format
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ #: lib/mv_web/live/member_live/show.ex:47
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Id"
 #~ msgstr "ID"
 
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Not set"
+#~ msgstr "Nicht gesetzt"
+
+#~ #: lib/mv_web/live/user_live/index.html.heex:52
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format
+#~ msgid "OIDC ID"
+#~ msgstr "OIDC ID"
+
 #~ #: lib/mv_web/live/member_live/show.ex:33
 #~ #, elixir-autogen, elixir-format
 #~ msgid "This is a member record from your database."
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 9f0d0aa..731f1be 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -11,13 +11,14 @@
 msgid ""
 msgstr ""
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex:387
+#: lib/mv_web/live/contribution_period_live/show.ex:141
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/user_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
@@ -34,32 +35,35 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/user_live/index.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:241
+#: lib/mv_web/live/contribution_type_live/index.ex:66
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/user_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
+#: lib/mv_web/live/member_live/form.ex:242
 #: lib/mv_web/live/member_live/show.ex:40
 #: lib/mv_web/live/member_live/show.ex:197
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:58
 #: lib/mv_web/live/member_live/form.ex:106
 #: lib/mv_web/live/member_live/index.html.heex:112
 #: lib/mv_web/live/member_live/show.ex:75
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "New Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/user_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
@@ -121,6 +125,7 @@ msgstr ""
 msgid "House Number"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:140
 #: lib/mv_web/live/member_live/form.ex:126
 #: lib/mv_web/live/member_live/show.ex:124
 #, elixir-autogen, elixir-format
@@ -129,6 +134,8 @@ msgstr ""
 
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
+#: lib/mv_web/live/contribution_period_live/show.ex:186
+#: lib/mv_web/live/contribution_period_live/show.ex:241
 #: lib/mv_web/live/member_live/form.ex:199
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/show.ex:162
@@ -158,7 +165,7 @@ msgstr ""
 #: lib/mv_web/live/global_settings_live.ex:55
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/form.ex:210
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
@@ -170,8 +177,8 @@ msgid "Street"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:303
+#: lib/mv_web/live/member_live/index/formatter.ex:62
+#: lib/mv_web/live/member_live/show.ex:290
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
@@ -182,8 +189,8 @@ msgid "Show Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:303
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:290
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
@@ -241,7 +248,7 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/index.ex:120
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:208
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/user_live/form.ex:252
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
@@ -261,22 +268,17 @@ msgstr ""
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_live/form.ex:62
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:102
+#: lib/mv_web/components/layouts/navbar.ex:113
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
@@ -288,18 +290,19 @@ msgid "Listing Users"
 msgstr ""
 
 #: lib/mv_web/live/custom_field_value_live/form.ex:60
-#: lib/mv_web/live/member_live/form.ex:242
 #, elixir-autogen, elixir-format
 msgid "Member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/member_live/index.ex:73
+#: lib/mv_web/live/contribution_type_live/index.ex:61
+#: lib/mv_web/live/member_live/index.ex:74
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex:48
 #: lib/mv_web/live/custom_field_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -310,16 +313,12 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "Not set"
-msgstr ""
-
+#: lib/mv_web/live/contribution_period_live/show.ex:207
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -327,18 +326,12 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr ""
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:95
+#: lib/mv_web/components/layouts/navbar.ex:106
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
@@ -358,17 +351,17 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/components/layouts/navbar.ex:110
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex:250
 #, elixir-autogen, elixir-format
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Show User"
 msgstr ""
@@ -388,7 +381,7 @@ msgstr ""
 msgid "Use this form to manage user records in your database."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:266
+#: lib/mv_web/live/user_live/form.ex:268
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -416,8 +409,7 @@ msgstr ""
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:241
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex:267
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
@@ -493,8 +485,8 @@ msgid "User will be created without a password. Check 'Set Password' to add one.
 msgstr ""
 
 #: lib/mv_web/live/user_live/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format
 msgid "Linked Member"
 msgstr ""
@@ -504,8 +496,8 @@ msgstr ""
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex:56
+#: lib/mv_web/live/user_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
@@ -526,14 +518,14 @@ msgstr ""
 msgid "Back to users list"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:33
-#: lib/mv_web/components/layouts/navbar.ex:39
+#: lib/mv_web/components/layouts/navbar.ex:44
+#: lib/mv_web/components/layouts/navbar.ex:50
 #, elixir-autogen, elixir-format
 msgid "Select language"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:46
-#: lib/mv_web/components/layouts/navbar.ex:66
+#: lib/mv_web/components/layouts/navbar.ex:57
+#: lib/mv_web/components/layouts/navbar.ex:77
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr ""
@@ -701,6 +693,7 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 
+#: lib/mv_web/live/contribution_settings_live.ex:102
 #: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format
 msgid "Save Settings"
@@ -721,7 +714,7 @@ msgstr ""
 msgid "Available members"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex:359
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr ""
@@ -761,7 +754,7 @@ msgstr ""
 msgid "Unlinking scheduled"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex:160
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -778,12 +771,12 @@ msgstr ""
 msgid "Copy emails"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex:149
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex:146
 #, elixir-autogen, elixir-format
 msgid "No members selected"
 msgstr ""
@@ -798,7 +791,7 @@ msgstr ""
 msgid "Open in email program"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex:169
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
@@ -923,3 +916,434 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "yearly"
 msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex:242
+#, elixir-autogen, elixir-format
+msgid "Create Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:107
+#, elixir-autogen, elixir-format
+msgid "%{count} period selected"
+msgid_plural "%{count} periods selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:113
+#, elixir-autogen, elixir-format
+msgid "About Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:138
+#: lib/mv_web/live/contribution_type_live/index.ex:53
+#, elixir-autogen, elixir-format
+msgid "Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:48
+#, elixir-autogen, elixir-format
+msgid "Back to Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:124
+#, elixir-autogen, elixir-format
+msgid "Can be changed at any time. Amount changes affect future periods only."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:77
+#, elixir-autogen, elixir-format
+msgid "Cannot delete - members assigned"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:83
+#, elixir-autogen, elixir-format
+msgid "Change Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:42
+#, elixir-autogen, elixir-format
+msgid "Configure global settings for membership contributions."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:34
+#: lib/mv_web/live/contribution_settings_live.ex:27
+#: lib/mv_web/live/contribution_settings_live.ex:40
+#, elixir-autogen, elixir-format
+msgid "Contribution Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:62
+#, elixir-autogen, elixir-format
+msgid "Contribution Start"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:32
+#: lib/mv_web/live/contribution_type_live/index.ex:25
+#: lib/mv_web/live/contribution_type_live/index.ex:36
+#, elixir-autogen, elixir-format
+msgid "Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:224
+#, elixir-autogen, elixir-format
+msgid "Contribution start"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:41
+#, elixir-autogen, elixir-format
+msgid "Contribution type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:117
+#, elixir-autogen, elixir-format
+msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:30
+#, elixir-autogen, elixir-format
+msgid "Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:39
+#, elixir-autogen, elixir-format
+msgid "Contributions for %{name}"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:159
+#, elixir-autogen, elixir-format
+msgid "Current"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:60
+#, elixir-autogen, elixir-format
+msgid "Default Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:133
+#, elixir-autogen, elixir-format
+msgid "Deletion"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:173
+#, elixir-autogen, elixir-format
+msgid "Example: Member Contribution View"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:113
+#, elixir-autogen, elixir-format
+msgid "Examples"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:262
+#: lib/mv_web/live/contribution_type_live/index.ex:172
+#, elixir-autogen, elixir-format
+msgid "Family"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:128
+#, elixir-autogen, elixir-format
+msgid "Fixed after creation. Members can only switch between types with the same interval."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:228
+#, elixir-autogen, elixir-format
+msgid "Generated periods"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:52
+#, elixir-autogen, elixir-format
+msgid "Global Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:343
+#: lib/mv_web/live/contribution_settings_live.ex:275
+#: lib/mv_web/live/contribution_type_live/index.ex:203
+#, elixir-autogen, elixir-format
+msgid "Half-yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:181
+#, elixir-autogen, elixir-format
+msgid "Half-yearly contribution for supporting members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_type_live/index.ex:188
+#, elixir-autogen, elixir-format
+msgid "Honorary"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:85
+#, elixir-autogen, elixir-format
+msgid "Include joining period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:137
+#: lib/mv_web/live/contribution_type_live/index.ex:57
+#: lib/mv_web/live/contribution_type_live/index.ex:127
+#, elixir-autogen, elixir-format
+msgid "Interval"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:220
+#, elixir-autogen, elixir-format
+msgid "Joining date"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:331
+#, elixir-autogen, elixir-format
+msgid "Joining year - reduced to 0"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:38
+#, elixir-autogen, elixir-format
+msgid "Manage contribution types for membership fees."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:116
+#, elixir-autogen, elixir-format
+msgid "Mark as Paid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:120
+#, elixir-autogen, elixir-format
+msgid "Mark as Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:124
+#, elixir-autogen, elixir-format
+msgid "Mark as Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:26
+#, elixir-autogen, elixir-format
+msgid "Member Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:122
+#, elixir-autogen, elixir-format
+msgid "Member pays for the year they joined"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:155
+#, elixir-autogen, elixir-format
+msgid "Member pays from the joining month"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:144
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full quarter"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:133
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full year"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:43
+#, elixir-autogen, elixir-format
+msgid "Member since"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:92
+#, elixir-autogen, elixir-format
+msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:341
+#: lib/mv_web/live/contribution_settings_live.ex:273
+#: lib/mv_web/live/contribution_type_live/index.ex:201
+#, elixir-autogen, elixir-format
+msgid "Monthly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:150
+#, elixir-autogen, elixir-format
+msgid "Monthly Interval - Joining Period Included"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:165
+#, elixir-autogen, elixir-format
+msgid "Monthly fee for students and trainees"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:123
+#, elixir-autogen, elixir-format
+msgid "Name & Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:42
+#, elixir-autogen, elixir-format
+msgid "New Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:189
+#, elixir-autogen, elixir-format
+msgid "No fee for honorary members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:134
+#, elixir-autogen, elixir-format
+msgid "Only possible if no members are assigned to this type."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:70
+#, elixir-autogen, elixir-format
+msgid "Open Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:301
+#, elixir-autogen, elixir-format
+msgid "Paid via bank transfer"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:225
+#: lib/mv_web/live/contribution_settings_live.ex:197
+#: lib/mv_web/live/contribution_type_live/index.ex:97
+#, elixir-autogen, elixir-format
+msgid "Preview Mockup"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:342
+#: lib/mv_web/live/contribution_settings_live.ex:274
+#: lib/mv_web/live/contribution_type_live/index.ex:202
+#, elixir-autogen, elixir-format
+msgid "Quarterly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:139
+#, elixir-autogen, elixir-format
+msgid "Quarterly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:173
+#, elixir-autogen, elixir-format
+msgid "Quarterly fee for family memberships"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_settings_live.ex:250
+#: lib/mv_web/live/contribution_type_live/index.ex:156
+#, elixir-autogen, elixir-format
+msgid "Reduced"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:157
+#, elixir-autogen, elixir-format
+msgid "Reduced fee for unemployed, pensioners, or low income"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:275
+#: lib/mv_web/live/contribution_settings_live.ex:244
+#: lib/mv_web/live/contribution_type_live/index.ex:148
+#, elixir-autogen, elixir-format
+msgid "Regular"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:204
+#, elixir-autogen, elixir-format
+msgid "Reopen"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:176
+#, elixir-autogen, elixir-format
+msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:149
+#, elixir-autogen, elixir-format
+msgid "Standard membership fee for regular members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:139
+#, elixir-autogen, elixir-format
+msgid "Status"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:256
+#: lib/mv_web/live/contribution_type_live/index.ex:164
+#, elixir-autogen, elixir-format
+msgid "Student"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:180
+#, elixir-autogen, elixir-format
+msgid "Supporting Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:195
+#, elixir-autogen, elixir-format
+msgid "Suspend"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:259
+#, elixir-autogen, elixir-format
+msgid "Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:69
+#, elixir-autogen, elixir-format
+msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:227
+#: lib/mv_web/live/contribution_settings_live.ex:199
+#: lib/mv_web/live/contribution_type_live/index.ex:99
+#, elixir-autogen, elixir-format
+msgid "This page is not functional and only displays the planned features."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:136
+#, elixir-autogen, elixir-format
+msgid "Time Period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:66
+#, elixir-autogen, elixir-format
+msgid "Total Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:250
+#, elixir-autogen, elixir-format
+msgid "Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:183
+#, elixir-autogen, elixir-format
+msgid "View Example Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:90
+#, elixir-autogen, elixir-format
+msgid "When active: Members pay from the period of their joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:93
+#, elixir-autogen, elixir-format
+msgid "When inactive: Members pay from the next full period after joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:98
+#, elixir-autogen, elixir-format
+msgid "Why are not all contribution types shown?"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:85
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_period_live/show.ex:344
+#: lib/mv_web/live/contribution_settings_live.ex:276
+#: lib/mv_web/live/contribution_type_live/index.ex:204
+#, elixir-autogen, elixir-format
+msgid "Yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:128
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:117
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Included"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 9cb10a3..3c9be04 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -11,13 +11,14 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/mv_web/components/core_components.ex:386
+#: lib/mv_web/components/core_components.ex:387
+#: lib/mv_web/live/contribution_period_live/show.ex:141
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:248
-#: lib/mv_web/live/user_live/index.html.heex:72
+#: lib/mv_web/live/user_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Are you sure?"
 msgstr ""
@@ -34,32 +35,35 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex:78
 #: lib/mv_web/live/member_live/index.html.heex:250
-#: lib/mv_web/live/user_live/index.html.heex:74
+#: lib/mv_web/live/user_live/index.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:241
+#: lib/mv_web/live/contribution_type_live/index.ex:66
 #: lib/mv_web/live/member_live/index.html.heex:242
-#: lib/mv_web/live/user_live/form.ex:265
-#: lib/mv_web/live/user_live/index.html.heex:66
+#: lib/mv_web/live/user_live/form.ex:267
+#: lib/mv_web/live/user_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
+#: lib/mv_web/live/member_live/form.ex:242
 #: lib/mv_web/live/member_live/show.ex:40
 #: lib/mv_web/live/member_live/show.ex:197
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:58
 #: lib/mv_web/live/member_live/form.ex:106
 #: lib/mv_web/live/member_live/index.html.heex:112
 #: lib/mv_web/live/member_live/show.ex:75
 #: lib/mv_web/live/user_live/form.ex:46
 #: lib/mv_web/live/user_live/index.html.heex:44
-#: lib/mv_web/live/user_live/show.ex:50
+#: lib/mv_web/live/user_live/show.ex:49
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "New Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:239
-#: lib/mv_web/live/user_live/index.html.heex:63
+#: lib/mv_web/live/user_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
@@ -121,6 +125,7 @@ msgstr ""
 msgid "House Number"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex:140
 #: lib/mv_web/live/member_live/form.ex:126
 #: lib/mv_web/live/member_live/show.ex:124
 #, elixir-autogen, elixir-format
@@ -129,6 +134,8 @@ msgstr ""
 
 #: lib/mv_web/live/components/payment_filter_component.ex:94
 #: lib/mv_web/live/components/payment_filter_component.ex:144
+#: lib/mv_web/live/contribution_period_live/show.ex:186
+#: lib/mv_web/live/contribution_period_live/show.ex:241
 #: lib/mv_web/live/member_live/form.ex:199
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/show.ex:162
@@ -158,7 +165,7 @@ msgstr ""
 #: lib/mv_web/live/global_settings_live.ex:55
 #: lib/mv_web/live/member_live/form.ex:48
 #: lib/mv_web/live/member_live/form.ex:210
-#: lib/mv_web/live/user_live/form.ex:248
+#: lib/mv_web/live/user_live/form.ex:249
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
@@ -170,8 +177,8 @@ msgid "Street"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:61
-#: lib/mv_web/live/member_live/show.ex:303
+#: lib/mv_web/live/member_live/index/formatter.ex:62
+#: lib/mv_web/live/member_live/show.ex:290
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
@@ -182,8 +189,8 @@ msgid "Show Member"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index.html.heex:234
-#: lib/mv_web/live/member_live/index/formatter.ex:60
-#: lib/mv_web/live/member_live/show.ex:303
+#: lib/mv_web/live/member_live/index/formatter.ex:61
+#: lib/mv_web/live/member_live/show.ex:290
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
@@ -241,7 +248,7 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/index.ex:120
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:208
-#: lib/mv_web/live/user_live/form.ex:251
+#: lib/mv_web/live/user_live/form.ex:252
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
@@ -261,22 +268,17 @@ msgstr ""
 msgid "Edit User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:49
-#, elixir-autogen, elixir-format
-msgid "ID"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_live/form.ex:62
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:102
+#: lib/mv_web/components/layouts/navbar.ex:113
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
@@ -288,18 +290,19 @@ msgid "Listing Users"
 msgstr ""
 
 #: lib/mv_web/live/custom_field_value_live/form.ex:60
-#: lib/mv_web/live/member_live/form.ex:242
 #, elixir-autogen, elixir-format
 msgid "Member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex:25
-#: lib/mv_web/live/member_live/index.ex:73
+#: lib/mv_web/live/contribution_type_live/index.ex:61
+#: lib/mv_web/live/member_live/index.ex:74
 #: lib/mv_web/live/member_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex:48
 #: lib/mv_web/live/custom_field_live/form.ex:51
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -310,16 +313,12 @@ msgstr ""
 msgid "New User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:53
+#: lib/mv_web/live/user_live/show.ex:51
 #, elixir-autogen, elixir-format
 msgid "Not enabled"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Not set"
-msgstr ""
-
+#: lib/mv_web/live/contribution_period_live/show.ex:207
 #: lib/mv_web/live/user_live/form.ex:107
 #: lib/mv_web/live/user_live/form.ex:115
 #: lib/mv_web/live/user_live/form.ex:224
@@ -327,18 +326,12 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:52
-#: lib/mv_web/live/user_live/show.ex:51
-#, elixir-autogen, elixir-format
-msgid "OIDC ID"
-msgstr ""
-
-#: lib/mv_web/live/user_live/show.ex:52
+#: lib/mv_web/live/user_live/show.ex:50
 #, elixir-autogen, elixir-format
 msgid "Password Authentication"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:95
+#: lib/mv_web/components/layouts/navbar.ex:106
 #, elixir-autogen, elixir-format
 msgid "Profil"
 msgstr ""
@@ -358,17 +351,17 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/components/layouts/navbar.ex:110
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:249
+#: lib/mv_web/live/user_live/form.ex:250
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/show.ex:79
+#: lib/mv_web/live/user_live/show.ex:77
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show User"
 msgstr ""
@@ -388,7 +381,7 @@ msgstr ""
 msgid "Use this form to manage user records in your database."
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:266
+#: lib/mv_web/live/user_live/form.ex:268
 #: lib/mv_web/live/user_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -416,8 +409,7 @@ msgstr ""
 msgid "descending"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:241
-#: lib/mv_web/live/user_live/form.ex:265
+#: lib/mv_web/live/user_live/form.ex:267
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
@@ -493,8 +485,8 @@ 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/form.ex:126
-#: lib/mv_web/live/user_live/index.html.heex:53
-#: lib/mv_web/live/user_live/show.ex:55
+#: lib/mv_web/live/user_live/index.html.heex:52
+#: lib/mv_web/live/user_live/show.ex:53
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Linked Member"
 msgstr ""
@@ -504,8 +496,8 @@ msgstr ""
 msgid "Linked User"
 msgstr ""
 
-#: lib/mv_web/live/user_live/index.html.heex:57
-#: lib/mv_web/live/user_live/show.ex:65
+#: lib/mv_web/live/user_live/index.html.heex:56
+#: lib/mv_web/live/user_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "No member linked"
 msgstr ""
@@ -526,14 +518,14 @@ msgstr ""
 msgid "Back to users list"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:33
-#: lib/mv_web/components/layouts/navbar.ex:39
+#: lib/mv_web/components/layouts/navbar.ex:44
+#: lib/mv_web/components/layouts/navbar.ex:50
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Select language"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:46
-#: lib/mv_web/components/layouts/navbar.ex:66
+#: lib/mv_web/components/layouts/navbar.ex:57
+#: lib/mv_web/components/layouts/navbar.ex:77
 #, elixir-autogen, elixir-format
 msgid "Toggle dark mode"
 msgstr ""
@@ -701,6 +693,7 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 
+#: lib/mv_web/live/contribution_settings_live.ex:102
 #: lib/mv_web/live/global_settings_live.ex:56
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
@@ -721,7 +714,7 @@ msgstr ""
 msgid "Available members"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex:357
+#: lib/mv_web/live/user_live/form.ex:359
 #, elixir-autogen, elixir-format
 msgid "Failed to link member: %{error}"
 msgstr ""
@@ -761,7 +754,7 @@ msgstr ""
 msgid "Unlinking scheduled"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:159
+#: lib/mv_web/live/member_live/index.ex:160
 #, elixir-autogen, elixir-format
 msgid "Copied %{count} email address to clipboard"
 msgid_plural "Copied %{count} email addresses to clipboard"
@@ -778,12 +771,12 @@ msgstr ""
 msgid "Copy emails"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:148
+#: lib/mv_web/live/member_live/index.ex:149
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:145
+#: lib/mv_web/live/member_live/index.ex:146
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No members selected"
 msgstr ""
@@ -798,7 +791,7 @@ msgstr ""
 msgid "Open in email program"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex:168
+#: lib/mv_web/live/member_live/index.ex:169
 #, elixir-autogen, elixir-format
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
@@ -924,11 +917,458 @@ msgstr ""
 msgid "yearly"
 msgstr ""
 
+#: lib/mv_web/live/member_live/form.ex:242
+#, elixir-autogen, elixir-format
+msgid "Create Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:107
+#, elixir-autogen, elixir-format
+msgid "%{count} period selected"
+msgid_plural "%{count} periods selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:113
+#, elixir-autogen, elixir-format
+msgid "About Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:138
+#: lib/mv_web/live/contribution_type_live/index.ex:53
+#, elixir-autogen, elixir-format
+msgid "Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:48
+#, elixir-autogen, elixir-format
+msgid "Back to Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:124
+#, elixir-autogen, elixir-format
+msgid "Can be changed at any time. Amount changes affect future periods only."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:77
+#, elixir-autogen, elixir-format
+msgid "Cannot delete - members assigned"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:83
+#, elixir-autogen, elixir-format
+msgid "Change Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:42
+#, elixir-autogen, elixir-format
+msgid "Configure global settings for membership contributions."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:34
+#: lib/mv_web/live/contribution_settings_live.ex:27
+#: lib/mv_web/live/contribution_settings_live.ex:40
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:62
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution Start"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:32
+#: lib/mv_web/live/contribution_type_live/index.ex:25
+#: lib/mv_web/live/contribution_type_live/index.ex:36
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:224
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution start"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:41
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:117
+#, elixir-autogen, elixir-format
+msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex:30
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:39
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contributions for %{name}"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:159
+#, elixir-autogen, elixir-format
+msgid "Current"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:60
+#, elixir-autogen, elixir-format
+msgid "Default Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:133
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Deletion"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:173
+#, elixir-autogen, elixir-format
+msgid "Example: Member Contribution View"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:113
+#, elixir-autogen, elixir-format
+msgid "Examples"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:262
+#: lib/mv_web/live/contribution_type_live/index.ex:172
+#, elixir-autogen, elixir-format
+msgid "Family"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:128
+#, elixir-autogen, elixir-format
+msgid "Fixed after creation. Members can only switch between types with the same interval."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:228
+#, elixir-autogen, elixir-format
+msgid "Generated periods"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:52
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Global Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:343
+#: lib/mv_web/live/contribution_settings_live.ex:275
+#: lib/mv_web/live/contribution_type_live/index.ex:203
+#, elixir-autogen, elixir-format
+msgid "Half-yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:181
+#, elixir-autogen, elixir-format
+msgid "Half-yearly contribution for supporting members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_type_live/index.ex:188
+#, elixir-autogen, elixir-format
+msgid "Honorary"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:85
+#, elixir-autogen, elixir-format
+msgid "Include joining period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:137
+#: lib/mv_web/live/contribution_type_live/index.ex:57
+#: lib/mv_web/live/contribution_type_live/index.ex:127
+#, elixir-autogen, elixir-format
+msgid "Interval"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:220
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Joining date"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:331
+#, elixir-autogen, elixir-format
+msgid "Joining year - reduced to 0"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:38
+#, elixir-autogen, elixir-format
+msgid "Manage contribution types for membership fees."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:116
+#, elixir-autogen, elixir-format
+msgid "Mark as Paid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:120
+#, elixir-autogen, elixir-format
+msgid "Mark as Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:124
+#, elixir-autogen, elixir-format
+msgid "Mark as Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:26
+#, elixir-autogen, elixir-format
+msgid "Member Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:122
+#, elixir-autogen, elixir-format
+msgid "Member pays for the year they joined"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:155
+#, elixir-autogen, elixir-format
+msgid "Member pays from the joining month"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:144
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full quarter"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:133
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full year"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:43
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Member since"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:92
+#, elixir-autogen, elixir-format
+msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:341
+#: lib/mv_web/live/contribution_settings_live.ex:273
+#: lib/mv_web/live/contribution_type_live/index.ex:201
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Monthly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:150
+#, elixir-autogen, elixir-format
+msgid "Monthly Interval - Joining Period Included"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:165
+#, elixir-autogen, elixir-format
+msgid "Monthly fee for students and trainees"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:123
+#, elixir-autogen, elixir-format
+msgid "Name & Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:42
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:189
+#, elixir-autogen, elixir-format
+msgid "No fee for honorary members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:134
+#, elixir-autogen, elixir-format
+msgid "Only possible if no members are assigned to this type."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:70
+#, elixir-autogen, elixir-format
+msgid "Open Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:301
+#, elixir-autogen, elixir-format
+msgid "Paid via bank transfer"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:225
+#: lib/mv_web/live/contribution_settings_live.ex:197
+#: lib/mv_web/live/contribution_type_live/index.ex:97
+#, elixir-autogen, elixir-format
+msgid "Preview Mockup"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:342
+#: lib/mv_web/live/contribution_settings_live.ex:274
+#: lib/mv_web/live/contribution_type_live/index.ex:202
+#, elixir-autogen, elixir-format
+msgid "Quarterly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:139
+#, elixir-autogen, elixir-format
+msgid "Quarterly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:173
+#, elixir-autogen, elixir-format
+msgid "Quarterly fee for family memberships"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_settings_live.ex:250
+#: lib/mv_web/live/contribution_type_live/index.ex:156
+#, elixir-autogen, elixir-format
+msgid "Reduced"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:157
+#, elixir-autogen, elixir-format
+msgid "Reduced fee for unemployed, pensioners, or low income"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:275
+#: lib/mv_web/live/contribution_settings_live.ex:244
+#: lib/mv_web/live/contribution_type_live/index.ex:148
+#, elixir-autogen, elixir-format
+msgid "Regular"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:204
+#, elixir-autogen, elixir-format
+msgid "Reopen"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:176
+#, elixir-autogen, elixir-format
+msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:149
+#, elixir-autogen, elixir-format
+msgid "Standard membership fee for regular members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:139
+#, elixir-autogen, elixir-format
+msgid "Status"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:256
+#: lib/mv_web/live/contribution_type_live/index.ex:164
+#, elixir-autogen, elixir-format
+msgid "Student"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex:180
+#, elixir-autogen, elixir-format
+msgid "Supporting Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:195
+#, elixir-autogen, elixir-format
+msgid "Suspend"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:259
+#, elixir-autogen, elixir-format
+msgid "Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:69
+#, elixir-autogen, elixir-format
+msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:227
+#: lib/mv_web/live/contribution_settings_live.ex:199
+#: lib/mv_web/live/contribution_type_live/index.ex:99
+#, elixir-autogen, elixir-format
+msgid "This page is not functional and only displays the planned features."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:136
+#, elixir-autogen, elixir-format
+msgid "Time Period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:66
+#, elixir-autogen, elixir-format
+msgid "Total Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:250
+#, elixir-autogen, elixir-format
+msgid "Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:183
+#, elixir-autogen, elixir-format
+msgid "View Example Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:90
+#, elixir-autogen, elixir-format
+msgid "When active: Members pay from the period of their joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:93
+#, elixir-autogen, elixir-format
+msgid "When inactive: Members pay from the next full period after joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:98
+#, elixir-autogen, elixir-format
+msgid "Why are not all contribution types shown?"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex:85
+#: lib/mv_web/live/contribution_period_live/show.ex:86
+#: lib/mv_web/live/contribution_period_live/show.ex:87
+#: lib/mv_web/live/contribution_period_live/show.ex:344
+#: lib/mv_web/live/contribution_settings_live.ex:276
+#: lib/mv_web/live/contribution_type_live/index.ex:204
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:128
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex:117
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Included"
+msgstr ""
+
+#~ #: lib/mv_web/live/user_live/show.ex:49
+#~ #, elixir-autogen, elixir-format
+#~ msgid "ID"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/show.ex:47
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Id"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Not set"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/user_live/index.html.heex:52
+#~ #: lib/mv_web/live/user_live/show.ex:51
+#~ #, elixir-autogen, elixir-format
+#~ msgid "OIDC ID"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/show.ex:33
 #~ #, elixir-autogen, elixir-format
 #~ msgid "This is a member record from your database."

From 80a06c360937d2d86bdb99433ae76804980a3ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= <hello@rafa.ee>
Date: Wed, 3 Dec 2025 16:19:42 +0100
Subject: [PATCH 10/12] Add some missing translations

This reverts commit 5c8a44c388b9f3392c09c3d313e6832f351cc735.
---
 priv/gettext/de/LC_MESSAGES/default.po | 585 +++++++++++++++++++++++--
 priv/gettext/default.pot               | 308 ++++++-------
 priv/gettext/en/LC_MESSAGES/default.po | 579 ++++++++++++++++++++++--
 3 files changed, 1250 insertions(+), 222 deletions(-)

diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index b5c69e8..82fbabe 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -11,6 +11,7 @@ msgstr ""
 "Language: en\n"
 
 #: lib/mv_web/components/core_components.ex
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr "Aktionen"
@@ -28,17 +29,18 @@ msgstr "Verbindung wird wiederhergestellt"
 
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr "Stadt"
 
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr "Löschen"
 
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
@@ -46,11 +48,13 @@ msgstr "Löschen"
 msgid "Edit"
 msgstr "Bearbeite"
 
+#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr "Mitglied bearbeiten"
 
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
@@ -80,6 +84,7 @@ msgstr "Beitrittsdatum"
 msgid "Last Name"
 msgstr "Nachname"
 
+#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "New Member"
@@ -112,13 +117,12 @@ msgstr "schließen"
 msgid "Exit Date"
 msgstr "Austrittsdatum"
 
-#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr "Hausnummer"
 
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
@@ -126,6 +130,7 @@ msgid "Notes"
 msgstr "Notizen"
 
 #: lib/mv_web/live/components/payment_filter_component.ex
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
@@ -133,16 +138,13 @@ msgstr "Notizen"
 msgid "Paid"
 msgstr "Bezahlt"
 
-#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr "Postleitzahl"
@@ -163,16 +165,10 @@ msgstr "Speichern..."
 
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr "Straße"
 
-#: lib/mv_web/live/member_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Id"
-msgstr "ID"
-
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -185,11 +181,6 @@ msgstr "Nein"
 msgid "Show Member"
 msgstr "Mitglied anzeigen"
 
-#: lib/mv_web/live/member_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "This is a member record from your database."
-msgstr "Dies ist ein Mitglied aus deiner Datenbank."
-
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -297,12 +288,14 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/member_live/index.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr "Mitglieder"
 
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -318,6 +311,7 @@ msgstr "Neue*r Benutzer*in"
 msgid "Not enabled"
 msgstr "Nicht aktiviert"
 
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Note"
@@ -580,16 +574,10 @@ msgstr "Diese E-Mail-Adresse ist bereits mit einem anderen OIDC-Konto verknüpft
 msgid "Choose a custom field"
 msgstr "Wähle ein Benutzerdefiniertes Feld"
 
-#: lib/mv_web/live/member_live/form.ex
-#: lib/mv_web/live/member_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Custom Field Values"
-msgstr "Benutzerdefinierte Feldwerte"
-
 #: lib/mv_web/live/custom_field_value_live/form.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Custom field"
-msgstr "Benutzerdefiniertes Feld"
+msgstr "Benutzerdefinierte Felder"
 
 #: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
@@ -622,6 +610,8 @@ msgid "Use this form to manage custom_field records in your database."
 msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten."
 
 #: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Custom Fields"
 msgstr "Benutzerdefinierte Felder"
@@ -688,6 +678,7 @@ msgstr "Vereinsdaten"
 msgid "Manage global settings for the association."
 msgstr "Passe übergreifende Einstellungen für den Verein an."
 
+#: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
@@ -790,11 +781,6 @@ msgstr "Im E-Mail-Programm öffnen"
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr "Tipp: E-Mail-Adressen ins BCC-Feld einfügen für Datenschutzkonformität"
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Fields marked with an asterisk (*) cannot be empty."
-msgstr "Felder, die mit einem Sternchen (*) markiert sind, dürfen nicht leer bleiben."
-
 #: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This field cannot be empty"
@@ -820,17 +806,551 @@ msgstr "Nicht bezahlt"
 msgid "Payment filter"
 msgstr "Zahlungsfilter"
 
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Address"
+msgstr "Adresse"
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Back"
+msgstr "Zurück"
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Coming soon"
+msgstr "Demnächst verfügbar"
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Contact Data"
+msgstr "Kontaktdaten"
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Nr."
+msgstr "Nr."
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Payment Cycle"
+msgstr "Zahlungszyklus"
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Payment Data"
+msgstr "Beitragsdaten"
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Payments"
+msgstr "Zahlungen"
+
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Pending"
+msgstr "Ausstehend"
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Personal Data"
+msgstr "Persönliche Daten"
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Save"
+msgstr "Speichern"
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "This data is for demonstration purposes only (mockup)."
+msgstr "Diese Daten dienen nur zu Demonstrationszwecken (Mockup)."
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "monthly"
+msgstr "monatlich"
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "yearly"
+msgstr "jährlich"
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Create Member"
+msgstr "Mitglied erstellen"
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "%{count} period selected"
+msgid_plural "%{count} periods selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "About Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Back to Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Can be changed at any time. Amount changes affect future periods only."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Cannot delete - members assigned"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Change Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Configure global settings for membership contributions."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution Settings"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution Start"
+msgstr "Beitrag"
+
+#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution Types"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution start"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution type"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contributions"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contributions for %{name}"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Current"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Default Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Deletion"
+msgstr "Löschen"
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Example: Member Contribution View"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Examples"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Family"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Fixed after creation. Members can only switch between types with the same interval."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Generated periods"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Global Settings"
+msgstr "Vereinsdaten"
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Half-yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Half-yearly contribution for supporting members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Honorary"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Include joining period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Interval"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Joining date"
+msgstr "Beitrittsdatum"
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Joining year - reduced to 0"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Manage contribution types for membership fees."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Mark as Paid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Mark as Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Mark as Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Member Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Member pays for the year they joined"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Member pays from the joining month"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full quarter"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full year"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Member since"
+msgstr "Mitglieder"
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Monthly"
+msgstr "monatlich"
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Monthly Interval - Joining Period Included"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Monthly fee for students and trainees"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Name & Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Contribution Type"
+msgstr "Beitrag"
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "No fee for honorary members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Only possible if no members are assigned to this type."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Open Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Paid via bank transfer"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Preview Mockup"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Quarterly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Quarterly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Quarterly fee for family memberships"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Reduced"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Reduced fee for unemployed, pensioners, or low income"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Regular"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Reopen"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Standard membership fee for regular members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Status"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Student"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Supporting Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Suspend"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "This page is not functional and only displays the planned features."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Time Period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Total Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "View Example Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "When active: Members pay from the period of their joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "When inactive: Members pay from the next full period after joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Why are not all contribution types shown?"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Yearly"
+msgstr "jährlich"
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Included"
+msgstr ""
+
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Birth Date"
 #~ msgstr "Geburtsdatum"
 
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Custom Field Values"
+#~ msgstr "Benutzerdefinierte Feldwerte"
+
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Fields marked with an asterisk (*) cannot be empty."
+#~ msgstr "Felder, die mit einem Sternchen (*) markiert sind, dürfen nicht leer bleiben."
+
+#~ #: lib/mv_web/live/custom_field_live/form.ex
 #~ #: lib/mv_web/live/user_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "ID"
 #~ msgstr "ID"
 
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Id"
+#~ msgstr "ID"
+
+#~ #: lib/mv_web/live/user_live/form.ex
 #~ #: lib/mv_web/live/user_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Not set"
@@ -841,3 +1361,8 @@ msgstr "Zahlungsfilter"
 #~ #, elixir-autogen, elixir-format
 #~ msgid "OIDC ID"
 #~ msgstr "OIDC ID"
+
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "This is a member record from your database."
+#~ msgstr "Dies ist ein Mitglied aus deiner Datenbank."
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 877d62b..5f94e73 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -12,6 +12,7 @@ msgid ""
 msgstr ""
 
 #: lib/mv_web/components/core_components.ex
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -29,17 +30,18 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
@@ -47,11 +49,13 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
+#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
@@ -81,6 +85,7 @@ msgstr ""
 msgid "Last Name"
 msgstr ""
 
+#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "New Member"
@@ -113,13 +118,12 @@ msgstr ""
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
@@ -127,6 +131,7 @@ msgid "Notes"
 msgstr ""
 
 #: lib/mv_web/live/components/payment_filter_component.ex
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
@@ -134,16 +139,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
@@ -164,16 +166,10 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Id"
-msgstr ""
-
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -186,11 +182,6 @@ msgstr ""
 msgid "Show Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "This is a member record from your database."
-msgstr ""
-
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -298,12 +289,14 @@ msgid "Member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/member_live/index.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -319,6 +312,7 @@ msgstr ""
 msgid "Not enabled"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Note"
@@ -581,12 +575,6 @@ msgstr ""
 msgid "Choose a custom field"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
-#: lib/mv_web/live/member_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Custom Field Values"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field"
@@ -623,6 +611,8 @@ msgid "Use this form to manage custom_field records in your database."
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Custom Fields"
 msgstr ""
@@ -689,6 +679,7 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 
+#: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Save Settings"
@@ -791,11 +782,6 @@ msgstr ""
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Fields marked with an asterisk (*) cannot be empty."
-msgstr ""
-
 #: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format
 msgid "This field cannot be empty"
@@ -821,524 +807,518 @@ msgstr ""
 msgid "Payment filter"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:70
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Address"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:37
-#: lib/mv_web/live/member_live/show.ex:32
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Back"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:65
-#: lib/mv_web/live/member_live/show.ex:50
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Coming soon"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:57
-#: lib/mv_web/live/member_live/show.ex:48
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Contact Data"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:175
-#: lib/mv_web/live/member_live/show.ex:160
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:94
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Nr."
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:186
-#: lib/mv_web/live/member_live/show.ex:161
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Payment Cycle"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:166
-#: lib/mv_web/live/member_live/show.ex:153
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Payment Data"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:68
-#: lib/mv_web/live/member_live/show.ex:52
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Payments"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex:166
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Pending"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:76
-#: lib/mv_web/live/member_live/show.ex:60
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Personal Data"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:111
-#: lib/mv_web/live/member_live/show.ex:87
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Phone"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:49
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:169
-#: lib/mv_web/live/member_live/show.ex:156
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "This data is for demonstration purposes only (mockup)."
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:190
-#: lib/mv_web/live/member_live/show.ex:161
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "monthly"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:194
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "yearly"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex:242
+#: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Create Member"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:107
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "%{count} period selected"
 msgid_plural "%{count} periods selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:113
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "About Contribution Types"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:138
-#: lib/mv_web/live/contribution_type_live/index.ex:53
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Amount"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:48
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Back to Settings"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:124
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Can be changed at any time. Amount changes affect future periods only."
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:77
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Cannot delete - members assigned"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:83
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Change Contribution Type"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:42
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Configure global settings for membership contributions."
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:34
-#: lib/mv_web/live/contribution_settings_live.ex:27
-#: lib/mv_web/live/contribution_settings_live.ex:40
+#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution Settings"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:62
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution Start"
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:32
-#: lib/mv_web/live/contribution_type_live/index.ex:25
-#: lib/mv_web/live/contribution_type_live/index.ex:36
+#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution Types"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:224
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution start"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:41
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution type"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:117
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
 msgstr ""
 
-#: lib/mv_web/components/layouts/navbar.ex:30
+#: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Contributions"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:39
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Contributions for %{name}"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:159
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Current"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:60
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Default Contribution Type"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:133
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Deletion"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:173
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Example: Member Contribution View"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:113
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Examples"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:262
-#: lib/mv_web/live/contribution_type_live/index.ex:172
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Family"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:128
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Fixed after creation. Members can only switch between types with the same interval."
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:228
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Generated periods"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:52
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Global Settings"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:343
-#: lib/mv_web/live/contribution_settings_live.ex:275
-#: lib/mv_web/live/contribution_type_live/index.ex:203
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Half-yearly"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:181
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Half-yearly contribution for supporting members"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_type_live/index.ex:188
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Honorary"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:85
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Include joining period"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:137
-#: lib/mv_web/live/contribution_type_live/index.ex:57
-#: lib/mv_web/live/contribution_type_live/index.ex:127
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Interval"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:220
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Joining date"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:331
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Joining year - reduced to 0"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:38
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Manage contribution types for membership fees."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:116
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Mark as Paid"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:120
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Mark as Suspended"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:124
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Mark as Unpaid"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:26
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Member Contributions"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:122
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays for the year they joined"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:155
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the joining month"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:144
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the next full quarter"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:133
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the next full year"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:43
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Member since"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:92
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:341
-#: lib/mv_web/live/contribution_settings_live.ex:273
-#: lib/mv_web/live/contribution_type_live/index.ex:201
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:150
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly Interval - Joining Period Included"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:165
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly fee for students and trainees"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:123
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Name & Amount"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:42
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "New Contribution Type"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:189
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "No fee for honorary members"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:134
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Only possible if no members are assigned to this type."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:70
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Open Contributions"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:301
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Paid via bank transfer"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:225
-#: lib/mv_web/live/contribution_settings_live.ex:197
-#: lib/mv_web/live/contribution_type_live/index.ex:97
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Preview Mockup"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:342
-#: lib/mv_web/live/contribution_settings_live.ex:274
-#: lib/mv_web/live/contribution_type_live/index.ex:202
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:139
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly Interval - Joining Period Excluded"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:173
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly fee for family memberships"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:86
-#: lib/mv_web/live/contribution_settings_live.ex:250
-#: lib/mv_web/live/contribution_type_live/index.ex:156
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Reduced"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:157
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Reduced fee for unemployed, pensioners, or low income"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:275
-#: lib/mv_web/live/contribution_settings_live.ex:244
-#: lib/mv_web/live/contribution_type_live/index.ex:148
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Regular"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:204
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Reopen"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:176
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:149
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Standard membership fee for regular members"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:139
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Status"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:256
-#: lib/mv_web/live/contribution_type_live/index.ex:164
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Student"
 msgstr ""
 
-#: lib/mv_web/live/contribution_type_live/index.ex:180
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Supporting Member"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:195
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Suspend"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:259
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Suspended"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:69
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:227
-#: lib/mv_web/live/contribution_settings_live.ex:199
-#: lib/mv_web/live/contribution_type_live/index.ex:99
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "This page is not functional and only displays the planned features."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:136
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Time Period"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:66
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Total Contributions"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:250
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Unpaid"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:183
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "View Example Member"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:90
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "When active: Members pay from the period of their joining."
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:93
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "When inactive: Members pay from the next full period after joining."
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:98
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Why are not all contribution types shown?"
 msgstr ""
 
-#: lib/mv_web/live/contribution_period_live/show.ex:85
-#: lib/mv_web/live/contribution_period_live/show.ex:86
-#: lib/mv_web/live/contribution_period_live/show.ex:87
-#: lib/mv_web/live/contribution_period_live/show.ex:344
-#: lib/mv_web/live/contribution_settings_live.ex:276
-#: lib/mv_web/live/contribution_type_live/index.ex:204
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:128
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Period Excluded"
 msgstr ""
 
-#: lib/mv_web/live/contribution_settings_live.ex:117
+#: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Period Included"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 74eded2..47896b4 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -12,6 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/mv_web/components/core_components.ex
+#: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -29,17 +30,18 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
@@ -47,11 +49,13 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
+#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
@@ -81,6 +85,7 @@ msgstr ""
 msgid "Last Name"
 msgstr ""
 
+#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "New Member"
@@ -113,13 +118,12 @@ msgstr ""
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
@@ -127,6 +131,7 @@ msgid "Notes"
 msgstr ""
 
 #: lib/mv_web/live/components/payment_filter_component.ex
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
@@ -134,16 +139,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr ""
@@ -164,16 +166,10 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/index.html.heex
-#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Id"
-msgstr ""
-
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -186,11 +182,6 @@ msgstr ""
 msgid "Show Member"
 msgstr ""
 
-#: lib/mv_web/live/member_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "This is a member record from your database."
-msgstr ""
-
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -298,12 +289,14 @@ msgid "Member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/member_live/index.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Members"
 msgstr ""
 
+#: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/custom_field_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
@@ -319,6 +312,7 @@ msgstr ""
 msgid "Not enabled"
 msgstr ""
 
+#: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Note"
@@ -581,12 +575,6 @@ msgstr ""
 msgid "Choose a custom field"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
-#: lib/mv_web/live/member_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Custom Field Values"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field"
@@ -623,6 +611,8 @@ msgid "Use this form to manage custom_field records in your database."
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Custom Fields"
 msgstr ""
@@ -689,6 +679,7 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 
+#: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
@@ -791,11 +782,6 @@ msgstr ""
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Fields marked with an asterisk (*) cannot be empty."
-msgstr ""
-
 #: lib/mv_web/components/core_components.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This field cannot be empty"
@@ -821,17 +807,549 @@ msgstr ""
 msgid "Payment filter"
 msgstr ""
 
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Address"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Back"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Coming soon"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Contact Data"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Nr."
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Payment Cycle"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Payment Data"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Payments"
+msgstr ""
+
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Pending"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Personal Data"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Phone"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "This data is for demonstration purposes only (mockup)."
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "monthly"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "yearly"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Create Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "%{count} period selected"
+msgid_plural "%{count} periods selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "About Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Back to Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Can be changed at any time. Amount changes affect future periods only."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Cannot delete - members assigned"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Change Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Configure global settings for membership contributions."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution Start"
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution Types"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution start"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+msgstr ""
+
+#: lib/mv_web/components/layouts/navbar.ex
+#, elixir-autogen, elixir-format
+msgid "Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Contributions for %{name}"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Current"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Default Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Deletion"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Example: Member Contribution View"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Examples"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Family"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Fixed after creation. Members can only switch between types with the same interval."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Generated periods"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Global Settings"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Half-yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Half-yearly contribution for supporting members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Honorary"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Include joining period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Interval"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Joining date"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Joining year - reduced to 0"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Manage contribution types for membership fees."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Mark as Paid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Mark as Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Mark as Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Member Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Member pays for the year they joined"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Member pays from the joining month"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full quarter"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Member pays from the next full year"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Member since"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Monthly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Monthly Interval - Joining Period Included"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Monthly fee for students and trainees"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Name & Amount"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "New Contribution Type"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "No fee for honorary members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Only possible if no members are assigned to this type."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Open Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Paid via bank transfer"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Preview Mockup"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Quarterly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Quarterly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Quarterly fee for family memberships"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Reduced"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Reduced fee for unemployed, pensioners, or low income"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Regular"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Reopen"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Standard membership fee for regular members"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Status"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Student"
+msgstr ""
+
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Supporting Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Suspend"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Suspended"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "This page is not functional and only displays the planned features."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Time Period"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Total Contributions"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Unpaid"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "View Example Member"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "When active: Members pay from the period of their joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "When inactive: Members pay from the next full period after joining."
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Why are not all contribution types shown?"
+msgstr ""
+
+#: lib/mv_web/live/contribution_period_live/show.ex
+#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/contribution_type_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Yearly"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Excluded"
+msgstr ""
+
+#: lib/mv_web/live/contribution_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Yearly Interval - Joining Period Included"
+msgstr ""
+
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Birth Date"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Custom Field Values"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/form.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Fields marked with an asterisk (*) cannot be empty."
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/user_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "ID"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Id"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/user_live/show.ex
 #~ #, elixir-autogen, elixir-format, fuzzy
 #~ msgid "Not set"
@@ -842,3 +1360,8 @@ msgstr ""
 #~ #, elixir-autogen, elixir-format
 #~ msgid "OIDC ID"
 #~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "This is a member record from your database."
+#~ msgstr ""

From a92771ffcae376b98bcc79bc88fc01cf0710fa0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= <hello@rafa.ee>
Date: Wed, 3 Dec 2025 16:06:07 +0100
Subject: [PATCH 11/12] Also remove "-" prefix from merge conflicts in .po
 files

---
 Justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Justfile b/Justfile
index 25fb35c..2231525 100644
--- a/Justfile
+++ b/Justfile
@@ -90,7 +90,7 @@ clean:
 remove-gettext-conflicts:
   #!/usr/bin/env bash
   set -euo pipefail
-  find priv/gettext -type f -exec sed -i '/^<<<<<<</d; /^=======$/d; /^>>>>>>>/d; /^%%%%%%%/d; /^++++++/d; s/^+//' {} \;
+  find priv/gettext -type f -exec sed -i '/^<<<<<<</d; /^=======$/d; /^>>>>>>>/d; /^%%%%%%%/d; /^++++++/d; s/^+//; s/^-//' {} \;
 
 # Production environment commands
 # ================================

From ba5fc34d80480150a747d3e7496d0d042cd355b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= <hello@rafa.ee>
Date: Tue, 2 Dec 2025 19:24:45 +0100
Subject: [PATCH 12/12] Move custom fields to global admin settings

---
 lib/mv_web/components/layouts/navbar.ex       |   2 +-
 lib/mv_web/live/custom_field_live/form.ex     | 142 ----------
 .../live/custom_field_live/form_component.ex  | 122 +++++++++
 lib/mv_web/live/custom_field_live/index.ex    | 199 --------------
 .../live/custom_field_live/index_component.ex | 259 ++++++++++++++++++
 lib/mv_web/live/custom_field_live/show.ex     |  75 -----
 lib/mv_web/live/global_settings_live.ex       |  47 +++-
 lib/mv_web/router.ex                          |   6 -
 priv/gettext/de/LC_MESSAGES/default.po        | 117 ++++++--
 priv/gettext/default.pot                      | 107 ++++++--
 priv/gettext/en/LC_MESSAGES/default.po        | 117 ++++++--
 .../member_field_visibility_test.exs          |  14 -
 .../live/custom_field_live/deletion_test.exs  |  77 +++---
 test/mv_web/live/profile_navigation_test.exs  |   2 -
 14 files changed, 719 insertions(+), 567 deletions(-)
 delete mode 100644 lib/mv_web/live/custom_field_live/form.ex
 create mode 100644 lib/mv_web/live/custom_field_live/form_component.ex
 delete mode 100644 lib/mv_web/live/custom_field_live/index.ex
 create mode 100644 lib/mv_web/live/custom_field_live/index_component.ex
 delete mode 100644 lib/mv_web/live/custom_field_live/show.ex
 delete mode 100644 test/membership/member_field_visibility_test.exs

diff --git a/lib/mv_web/components/layouts/navbar.ex b/lib/mv_web/components/layouts/navbar.ex
index 1c1138e..4246c99 100644
--- a/lib/mv_web/components/layouts/navbar.ex
+++ b/lib/mv_web/components/layouts/navbar.ex
@@ -23,7 +23,7 @@ defmodule MvWeb.Layouts.Navbar do
         <a class="btn btn-ghost text-xl">{@club_name}</a>
         <ul class="menu menu-horizontal bg-base-200">
           <li><.link navigate="/members">{gettext("Members")}</.link></li>
-          <li><.link navigate="/custom_fields">{gettext("Custom Fields")}</.link></li>
+          <li><.link navigate="/settings">{gettext("Settings")}</.link></li>
           <li><.link navigate="/users">{gettext("Users")}</.link></li>
           <li>
             <details>
diff --git a/lib/mv_web/live/custom_field_live/form.ex b/lib/mv_web/live/custom_field_live/form.ex
deleted file mode 100644
index 99317a9..0000000
--- a/lib/mv_web/live/custom_field_live/form.ex
+++ /dev/null
@@ -1,142 +0,0 @@
-defmodule MvWeb.CustomFieldLive.Form do
-  @moduledoc """
-  LiveView form for creating and editing custom fields (admin).
-
-  ## Features
-  - Create new custom field definitions
-  - Edit existing custom fields
-  - Select value type from supported types
-  - Set immutable and required flags
-  - Real-time validation
-
-  ## Form Fields
-  **Required:**
-  - name - Unique identifier (e.g., "phone_mobile", "emergency_contact")
-  - value_type - Data type (:string, :integer, :boolean, :date, :email)
-
-  **Optional:**
-  - description - Human-readable explanation
-  - immutable - If true, values cannot be changed after creation (default: false)
-  - required - If true, all members must have this custom field (default: false)
-  - show_in_overview - If true, this custom field will be displayed in the member overview table (default: true)
-
-  ## Value Type Selection
-  - `:string` - Text data (unlimited length)
-  - `:integer` - Numeric data
-  - `:boolean` - True/false flags
-  - `:date` - Date values
-  - `:email` - Validated email addresses
-
-  ## Events
-  - `validate` - Real-time form validation
-  - `save` - Submit form (create or update custom field)
-
-  ## Security
-  Custom field management is restricted to admin users.
-  """
-  use MvWeb, :live_view
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <Layouts.app flash={@flash} current_user={@current_user}>
-      <.header>
-        {@page_title}
-        <:subtitle>
-          {gettext("Use this form to manage custom_field records in your database.")}
-        </:subtitle>
-      </.header>
-
-      <.form for={@form} id="custom_field-form" phx-change="validate" phx-submit="save">
-        <.input field={@form[:name]} type="text" label={gettext("Name")} />
-
-        <.input
-          field={@form[:value_type]}
-          type="select"
-          label={gettext("Value type")}
-          options={
-            Ash.Resource.Info.attribute(Mv.Membership.CustomField, :value_type).constraints[:one_of]
-          }
-        />
-        <.input field={@form[:description]} type="text" label={gettext("Description")} />
-        <.input field={@form[:immutable]} type="checkbox" label={gettext("Immutable")} />
-        <.input field={@form[:required]} type="checkbox" label={gettext("Required")} />
-        <.input field={@form[:show_in_overview]} type="checkbox" label={gettext("Show in overview")} />
-
-        <.button phx-disable-with={gettext("Saving...")} variant="primary">
-          {gettext("Save Custom field")}
-        </.button>
-        <.button navigate={return_path(@return_to, @custom_field)}>{gettext("Cancel")}</.button>
-      </.form>
-    </Layouts.app>
-    """
-  end
-
-  @impl true
-  def mount(params, _session, socket) do
-    custom_field =
-      case params["id"] do
-        nil -> nil
-        id -> Ash.get!(Mv.Membership.CustomField, id)
-      end
-
-    action = if is_nil(custom_field), do: "New", else: "Edit"
-    page_title = action <> " " <> "Custom field"
-
-    {:ok,
-     socket
-     |> assign(:return_to, return_to(params["return_to"]))
-     |> assign(custom_field: custom_field)
-     |> assign(:page_title, page_title)
-     |> assign_form()}
-  end
-
-  defp return_to("show"), do: "show"
-  defp return_to(_), do: "index"
-
-  @impl true
-  def handle_event("validate", %{"custom_field" => custom_field_params}, socket) do
-    {:noreply,
-     assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, custom_field_params))}
-  end
-
-  def handle_event("save", %{"custom_field" => custom_field_params}, socket) do
-    case AshPhoenix.Form.submit(socket.assigns.form, params: custom_field_params) do
-      {:ok, custom_field} ->
-        notify_parent({:saved, custom_field})
-
-        action =
-          case socket.assigns.form.source.type do
-            :create -> gettext("create")
-            :update -> gettext("update")
-            other -> to_string(other)
-          end
-
-        socket =
-          socket
-          |> put_flash(:info, gettext("Custom field %{action} successfully", action: action))
-          |> push_navigate(to: return_path(socket.assigns.return_to, custom_field))
-
-        {:noreply, socket}
-
-      {:error, form} ->
-        {:noreply, assign(socket, form: form)}
-    end
-  end
-
-  defp notify_parent(msg), do: send(self(), {__MODULE__, msg})
-
-  defp assign_form(%{assigns: %{custom_field: custom_field}} = socket) do
-    form =
-      if custom_field do
-        AshPhoenix.Form.for_update(custom_field, :update, as: "custom_field")
-      else
-        AshPhoenix.Form.for_create(Mv.Membership.CustomField, :create, as: "custom_field")
-      end
-
-    assign(socket, form: to_form(form))
-  end
-
-  defp return_path("index", _custom_field), do: ~p"/custom_fields"
-  defp return_path("show", custom_field), do: ~p"/custom_fields/#{custom_field.id}"
-end
diff --git a/lib/mv_web/live/custom_field_live/form_component.ex b/lib/mv_web/live/custom_field_live/form_component.ex
new file mode 100644
index 0000000..3c1b8d0
--- /dev/null
+++ b/lib/mv_web/live/custom_field_live/form_component.ex
@@ -0,0 +1,122 @@
+defmodule MvWeb.CustomFieldLive.FormComponent do
+  @moduledoc """
+  LiveComponent form for creating and editing custom fields (embedded in settings).
+
+  ## Features
+  - Create new custom field definitions
+  - Edit existing custom fields
+  - Select value type from supported types
+  - Set immutable and required flags
+  - Real-time validation
+
+  ## Props
+  - `custom_field` - The custom field to edit (nil for new)
+  - `on_save` - Callback function to call when form is saved
+  - `on_cancel` - Callback function to call when form is cancelled
+  """
+  use MvWeb, :live_component
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <div id={@id} class="mb-8 border shadow-xl card border-base-300">
+      <div class="card-body">
+        <div class="flex items-center gap-4 mb-4">
+          <.button type="button" phx-click="cancel" phx-target={@myself} aria-label={gettext("Back to custom field overview")}>
+            <.icon name="hero-arrow-left" class="w-4 h-4" />
+          </.button>
+          <h3 class="card-title">
+            {if @custom_field, do: gettext("Edit Custom Field"), else: gettext("New Custom Field")}
+          </h3>
+        </div>
+
+        <.form
+          for={@form}
+          id={@id <> "-form"}
+          phx-change="validate"
+          phx-submit="save"
+          phx-target={@myself}
+        >
+          <.input field={@form[:name]} type="text" label={gettext("Name")} />
+
+          <.input
+            field={@form[:value_type]}
+            type="select"
+            label={gettext("Value type")}
+            options={
+              Ash.Resource.Info.attribute(Mv.Membership.CustomField, :value_type).constraints[:one_of]
+            }
+          />
+          <.input field={@form[:description]} type="text" label={gettext("Description")} />
+          <.input field={@form[:immutable]} type="checkbox" label={gettext("Immutable")} />
+          <.input field={@form[:required]} type="checkbox" label={gettext("Required")} />
+          <.input
+            field={@form[:show_in_overview]}
+            type="checkbox"
+            label={gettext("Show in overview")}
+          />
+
+          <div class="justify-end mt-4 card-actions">
+            <.button type="button" phx-click="cancel" phx-target={@myself}>
+              {gettext("Cancel")}
+            </.button>
+            <.button phx-disable-with={gettext("Saving...")} variant="primary">
+              {gettext("Save Custom field")}
+            </.button>
+          </div>
+        </.form>
+      </div>
+    </div>
+    """
+  end
+
+  @impl true
+  def update(assigns, socket) do
+    {:ok,
+     socket
+     |> assign(assigns)
+     |> assign_form()}
+  end
+
+  @impl true
+  def handle_event("validate", %{"custom_field" => custom_field_params}, socket) do
+    {:noreply,
+     assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, custom_field_params))}
+  end
+
+  @impl true
+  def handle_event("save", %{"custom_field" => custom_field_params}, socket) do
+    case AshPhoenix.Form.submit(socket.assigns.form, params: custom_field_params) do
+      {:ok, custom_field} ->
+        action =
+          case socket.assigns.form.source.type do
+            :create -> gettext("create")
+            :update -> gettext("update")
+            other -> to_string(other)
+          end
+
+        socket.assigns.on_save.(custom_field, action)
+        {:noreply, socket}
+
+      {:error, form} ->
+        {:noreply, assign(socket, form: form)}
+    end
+  end
+
+  @impl true
+  def handle_event("cancel", _params, socket) do
+    socket.assigns.on_cancel.()
+    {:noreply, socket}
+  end
+
+  defp assign_form(%{assigns: %{custom_field: custom_field}} = socket) do
+    form =
+      if custom_field do
+        AshPhoenix.Form.for_update(custom_field, :update, as: "custom_field")
+      else
+        AshPhoenix.Form.for_create(Mv.Membership.CustomField, :create, as: "custom_field")
+      end
+
+    assign(socket, form: to_form(form))
+  end
+end
diff --git a/lib/mv_web/live/custom_field_live/index.ex b/lib/mv_web/live/custom_field_live/index.ex
deleted file mode 100644
index f711323..0000000
--- a/lib/mv_web/live/custom_field_live/index.ex
+++ /dev/null
@@ -1,199 +0,0 @@
-defmodule MvWeb.CustomFieldLive.Index do
-  @moduledoc """
-  LiveView for managing custom field definitions (admin).
-
-  ## Features
-  - List all custom fields
-  - Display type information (name, value type, description)
-  - Show immutable and required flags
-  - Create new custom fields
-  - Edit existing custom fields
-  - Delete custom fields with confirmation (cascades to all custom field values)
-
-  ## Displayed Information
-  - Name: Unique identifier for the custom field
-  - Value type: Data type constraint (string, integer, boolean, date, email)
-  - Description: Human-readable explanation
-  - Immutable: Whether custom field values can be changed after creation
-  - Required: Whether all members must have this custom field (future feature)
-
-  ## Events
-  - `prepare_delete` - Opens deletion confirmation modal with member count
-  - `confirm_delete` - Executes deletion after slug verification
-  - `cancel_delete` - Cancels deletion and closes modal
-  - `update_slug_confirmation` - Updates slug input state
-
-  ## Security
-  Custom field management is restricted to admin users.
-  Deletion requires entering the custom field's slug to prevent accidental deletions.
-  """
-  use MvWeb, :live_view
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <Layouts.app flash={@flash} current_user={@current_user}>
-      <.header>
-        Listing Custom fields
-        <:actions>
-          <.button variant="primary" navigate={~p"/custom_fields/new"}>
-            <.icon name="hero-plus" /> New Custom field
-          </.button>
-        </:actions>
-      </.header>
-
-      <.table
-        id="custom_fields"
-        rows={@streams.custom_fields}
-        row_click={fn {_id, custom_field} -> JS.navigate(~p"/custom_fields/#{custom_field}") end}
-      >
-        <:col :let={{_id, custom_field}} label="Name">{custom_field.name}</:col>
-
-        <:col :let={{_id, custom_field}} label="Description">{custom_field.description}</:col>
-
-        <:action :let={{_id, custom_field}}>
-          <div class="sr-only">
-            <.link navigate={~p"/custom_fields/#{custom_field}"}>Show</.link>
-          </div>
-
-          <.link navigate={~p"/custom_fields/#{custom_field}/edit"}>Edit</.link>
-        </:action>
-
-        <:action :let={{_id, custom_field}}>
-          <.link phx-click={JS.push("prepare_delete", value: %{id: custom_field.id})}>
-            Delete
-          </.link>
-        </:action>
-      </.table>
-
-      <%!-- Delete Confirmation Modal --%>
-      <dialog :if={@show_delete_modal} id="delete-custom-field-modal" class="modal modal-open">
-        <div class="modal-box">
-          <h3 class="font-bold text-lg">{gettext("Delete Custom Field")}</h3>
-
-          <div class="py-4 space-y-4">
-            <div class="alert alert-warning">
-              <.icon name="hero-exclamation-triangle" class="h-5 w-5" />
-              <div>
-                <p class="font-semibold">
-                  {ngettext(
-                    "%{count} member has a value assigned for this custom field.",
-                    "%{count} members have values assigned for this custom field.",
-                    @custom_field_to_delete.assigned_members_count,
-                    count: @custom_field_to_delete.assigned_members_count
-                  )}
-                </p>
-                <p class="text-sm mt-2">
-                  {gettext(
-                    "All custom field values will be permanently deleted when you delete this custom field."
-                  )}
-                </p>
-              </div>
-            </div>
-
-            <div>
-              <label for="slug-confirmation" class="label">
-                <span class="label-text">
-                  {gettext("To confirm deletion, please enter this text:")}
-                </span>
-              </label>
-              <div class="font-mono font-bold text-lg mb-2 p-2 bg-base-200 rounded break-all">
-                {@custom_field_to_delete.slug}
-              </div>
-              <form phx-change="update_slug_confirmation">
-                <input
-                  id="slug-confirmation"
-                  name="slug"
-                  type="text"
-                  value={@slug_confirmation}
-                  placeholder={gettext("Enter the text above to confirm")}
-                  autocomplete="off"
-                  phx-mounted={JS.focus()}
-                  class="input input-bordered w-full"
-                />
-              </form>
-            </div>
-          </div>
-
-          <div class="modal-action">
-            <button phx-click="cancel_delete" class="btn">
-              {gettext("Cancel")}
-            </button>
-            <button
-              phx-click="confirm_delete"
-              class="btn btn-error"
-              disabled={@slug_confirmation != @custom_field_to_delete.slug}
-            >
-              {gettext("Delete Custom Field and All Values")}
-            </button>
-          </div>
-        </div>
-      </dialog>
-    </Layouts.app>
-    """
-  end
-
-  @impl true
-  def mount(_params, _session, socket) do
-    {:ok,
-     socket
-     |> assign(:page_title, "Listing Custom fields")
-     |> assign(:show_delete_modal, false)
-     |> assign(:custom_field_to_delete, nil)
-     |> assign(:slug_confirmation, "")
-     |> stream(:custom_fields, Ash.read!(Mv.Membership.CustomField))}
-  end
-
-  @impl true
-  def handle_event("prepare_delete", %{"id" => id}, socket) do
-    custom_field = Ash.get!(Mv.Membership.CustomField, id, load: [:assigned_members_count])
-
-    {:noreply,
-     socket
-     |> assign(:custom_field_to_delete, custom_field)
-     |> assign(:show_delete_modal, true)
-     |> assign(:slug_confirmation, "")}
-  end
-
-  @impl true
-  def handle_event("update_slug_confirmation", %{"slug" => slug}, socket) do
-    {:noreply, assign(socket, :slug_confirmation, slug)}
-  end
-
-  @impl true
-  def handle_event("confirm_delete", _params, socket) do
-    custom_field = socket.assigns.custom_field_to_delete
-
-    if socket.assigns.slug_confirmation == custom_field.slug do
-      # Delete the custom field (CASCADE will handle custom field values)
-      case Ash.destroy(custom_field) do
-        :ok ->
-          {:noreply,
-           socket
-           |> put_flash(:info, "Custom field deleted successfully")
-           |> assign(:show_delete_modal, false)
-           |> assign(:custom_field_to_delete, nil)
-           |> assign(:slug_confirmation, "")
-           |> stream_delete(:custom_fields, custom_field)}
-
-        {:error, error} ->
-          {:noreply,
-           socket
-           |> put_flash(:error, "Failed to delete custom field: #{inspect(error)}")}
-      end
-    else
-      {:noreply,
-       socket
-       |> put_flash(:error, "Slug does not match. Deletion cancelled.")}
-    end
-  end
-
-  @impl true
-  def handle_event("cancel_delete", _params, socket) do
-    {:noreply,
-     socket
-     |> assign(:show_delete_modal, false)
-     |> assign(:custom_field_to_delete, nil)
-     |> assign(:slug_confirmation, "")}
-  end
-end
diff --git a/lib/mv_web/live/custom_field_live/index_component.ex b/lib/mv_web/live/custom_field_live/index_component.ex
new file mode 100644
index 0000000..9b8ff0d
--- /dev/null
+++ b/lib/mv_web/live/custom_field_live/index_component.ex
@@ -0,0 +1,259 @@
+defmodule MvWeb.CustomFieldLive.IndexComponent do
+  @moduledoc """
+  LiveComponent for managing custom field definitions (embedded in settings).
+
+  ## Features
+  - List all custom fields
+  - Display type information (name, value type, description)
+  - Show immutable and required flags
+  - Create new custom fields
+  - Edit existing custom fields
+  - Delete custom fields with confirmation (cascades to all custom field values)
+  """
+  use MvWeb, :live_component
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <div id={@id}>
+      <.header>
+        {gettext("Custom Fields")}
+        <:subtitle>
+          {gettext("These will appear in addition to other data when adding new members.")}
+        </:subtitle>
+        <:actions>
+          <.button variant="primary" phx-click="new_custom_field" phx-target={@myself}>
+            <.icon name="hero-plus" /> {gettext("New Custom field")}
+          </.button>
+        </:actions>
+      </.header>
+
+      <%!-- Show form when creating or editing --%>
+      <div :if={@show_form} class="mb-8">
+        <.live_component
+          module={MvWeb.CustomFieldLive.FormComponent}
+          id={@form_id}
+          custom_field={@editing_custom_field}
+          on_save={fn custom_field, action -> send(self(), {:custom_field_saved, custom_field, action}) end}
+          on_cancel={fn -> send_update(__MODULE__, id: @id, show_form: false) end}
+        />
+      </div>
+
+      <%!-- Hide table when form is visible --%>
+      <.table
+        :if={!@show_form}
+        id="custom_fields"
+        rows={@streams.custom_fields}
+        row_click={
+          fn {_id, custom_field} ->
+            JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself)
+          end
+        }
+      >
+        <:col :let={{_id, custom_field}} label={gettext("Name")}>{custom_field.name}</:col>
+
+        <:col :let={{_id, custom_field}} label={gettext("Value Type")}>
+          {custom_field.value_type}
+        </:col>
+
+        <:col :let={{_id, custom_field}} label={gettext("Description")}>
+          {custom_field.description}
+        </:col>
+
+        <:col :let={{_id, custom_field}} label={gettext("Show in Overview")}>
+          <span :if={custom_field.show_in_overview} class="badge badge-success">
+            {gettext("Yes")}
+          </span>
+          <span :if={!custom_field.show_in_overview} class="badge badge-ghost">
+            {gettext("No")}
+          </span>
+        </:col>
+
+        <:action :let={{_id, custom_field}}>
+          <.link phx-click={
+            JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself)
+          }>
+            {gettext("Edit")}
+          </.link>
+        </:action>
+
+        <:action :let={{_id, custom_field}}>
+          <.link phx-click={JS.push("prepare_delete", value: %{id: custom_field.id}, target: @myself)}>
+            {gettext("Delete")}
+          </.link>
+        </:action>
+      </.table>
+
+      <%!-- Delete Confirmation Modal --%>
+      <dialog :if={@show_delete_modal} id="delete-custom-field-modal" class="modal modal-open">
+        <div class="modal-box">
+          <h3 class="text-lg font-bold">{gettext("Delete Custom Field")}</h3>
+
+          <div class="py-4 space-y-4">
+            <div class="alert alert-warning">
+              <.icon name="hero-exclamation-triangle" class="w-5 h-5" />
+              <div>
+                <p class="font-semibold">
+                  {ngettext(
+                    "%{count} member has a value assigned for this custom field.",
+                    "%{count} members have values assigned for this custom field.",
+                    @custom_field_to_delete.assigned_members_count,
+                    count: @custom_field_to_delete.assigned_members_count
+                  )}
+                </p>
+                <p class="mt-2 text-sm">
+                  {gettext(
+                    "All custom field values will be permanently deleted when you delete this custom field."
+                  )}
+                </p>
+              </div>
+            </div>
+
+            <div>
+              <label for="slug-confirmation" class="label">
+                <span class="label-text">
+                  {gettext("To confirm deletion, please enter this text:")}
+                </span>
+              </label>
+              <div class="p-2 mb-2 font-mono text-lg font-bold break-all rounded bg-base-200">
+                {@custom_field_to_delete.slug}
+              </div>
+              <form phx-change="update_slug_confirmation" phx-target={@myself}>
+                <input
+                  id="slug-confirmation"
+                  name="slug"
+                  type="text"
+                  value={@slug_confirmation}
+                  placeholder={gettext("Enter the text above to confirm")}
+                  autocomplete="off"
+                  phx-mounted={JS.focus()}
+                  class="w-full input input-bordered"
+                />
+              </form>
+            </div>
+          </div>
+
+          <div class="modal-action">
+            <button phx-click="cancel_delete" phx-target={@myself} class="btn">
+              {gettext("Cancel")}
+            </button>
+            <button
+              phx-click="confirm_delete"
+              phx-target={@myself}
+              class="btn btn-error"
+              disabled={@slug_confirmation != @custom_field_to_delete.slug}
+            >
+              {gettext("Delete Custom Field and All Values")}
+            </button>
+          </div>
+        </div>
+      </dialog>
+    </div>
+    """
+  end
+
+  @impl true
+  def update(assigns, socket) do
+    # If show_form is explicitly provided in assigns, reset editing state
+    socket =
+      if Map.has_key?(assigns, :show_form) and assigns.show_form == false do
+        socket
+        |> assign(:editing_custom_field, nil)
+        |> assign(:form_id, "custom-field-form-new")
+      else
+        socket
+      end
+
+    {:ok,
+     socket
+     |> assign(assigns)
+     |> assign_new(:show_form, fn -> false end)
+     |> assign_new(:form_id, fn -> "custom-field-form-new" end)
+     |> assign_new(:editing_custom_field, fn -> nil end)
+     |> assign_new(:show_delete_modal, fn -> false end)
+     |> assign_new(:custom_field_to_delete, fn -> nil end)
+     |> assign_new(:slug_confirmation, fn -> "" end)
+     |> stream(:custom_fields, Ash.read!(Mv.Membership.CustomField), reset: true)}
+  end
+
+  @impl true
+  def handle_event("new_custom_field", _params, socket) do
+    {:noreply,
+     socket
+     |> assign(:show_form, true)
+     |> assign(:editing_custom_field, nil)
+     |> assign(:form_id, "custom-field-form-new")}
+  end
+
+  @impl true
+  def handle_event("edit_custom_field", %{"id" => id}, socket) do
+    custom_field = Ash.get!(Mv.Membership.CustomField, id)
+
+    {:noreply,
+     socket
+     |> assign(:show_form, true)
+     |> assign(:editing_custom_field, custom_field)
+     |> assign(:form_id, "custom-field-form-#{id}")}
+  end
+
+  @impl true
+  def handle_event("prepare_delete", %{"id" => id}, socket) do
+    custom_field = Ash.get!(Mv.Membership.CustomField, id, load: [:assigned_members_count])
+
+    {:noreply,
+     socket
+     |> assign(:custom_field_to_delete, custom_field)
+     |> assign(:show_delete_modal, true)
+     |> assign(:slug_confirmation, "")}
+  end
+
+  @impl true
+  def handle_event("update_slug_confirmation", %{"slug" => slug}, socket) do
+    {:noreply, assign(socket, :slug_confirmation, slug)}
+  end
+
+  @impl true
+  def handle_event("confirm_delete", _params, socket) do
+    custom_field = socket.assigns.custom_field_to_delete
+
+    if socket.assigns.slug_confirmation == custom_field.slug do
+      case Ash.destroy(custom_field) do
+        :ok ->
+          send(self(), {:custom_field_deleted, custom_field})
+
+          {:noreply,
+           socket
+           |> assign(:show_delete_modal, false)
+           |> assign(:custom_field_to_delete, nil)
+           |> assign(:slug_confirmation, "")
+           |> stream_delete(:custom_fields, custom_field)}
+
+        {:error, error} ->
+          send(self(), {:custom_field_delete_error, error})
+
+          {:noreply,
+           socket
+           |> assign(:show_delete_modal, false)
+           |> assign(:custom_field_to_delete, nil)
+           |> assign(:slug_confirmation, "")}
+      end
+    else
+      send(self(), :custom_field_slug_mismatch)
+
+      {:noreply,
+       socket
+       |> assign(:show_delete_modal, false)
+       |> assign(:custom_field_to_delete, nil)
+       |> assign(:slug_confirmation, "")}
+    end
+  end
+
+  @impl true
+  def handle_event("cancel_delete", _params, socket) do
+    {:noreply,
+     socket
+     |> assign(:show_delete_modal, false)
+     |> assign(:custom_field_to_delete, nil)
+     |> assign(:slug_confirmation, "")}
+  end
+end
diff --git a/lib/mv_web/live/custom_field_live/show.ex b/lib/mv_web/live/custom_field_live/show.ex
deleted file mode 100644
index 239b844..0000000
--- a/lib/mv_web/live/custom_field_live/show.ex
+++ /dev/null
@@ -1,75 +0,0 @@
-defmodule MvWeb.CustomFieldLive.Show do
-  @moduledoc """
-  LiveView for displaying a single custom field's details (admin).
-
-  ## Features
-  - Display custom field definition
-  - Show all attributes (name, value type, description, flags)
-  - Navigate to edit form
-  - Return to custom field list
-
-  ## Displayed Information
-  - ID: Internal UUID identifier
-  - Slug: URL-friendly identifier (auto-generated, immutable)
-  - Name: Unique identifier
-  - Value type: Data type constraint
-  - Description: Optional explanation
-  - Immutable flag: Whether values can be changed
-  - Required flag: Whether all members need this custom field
-
-  ## Navigation
-  - Back to custom field list
-  - Edit custom field
-
-  ## Security
-  Custom field details are restricted to admin users.
-  """
-  use MvWeb, :live_view
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <Layouts.app flash={@flash} current_user={@current_user}>
-      <.header>
-        Custom field {@custom_field.slug}
-        <:subtitle>This is a custom_field record from your database.</:subtitle>
-
-        <:actions>
-          <.button navigate={~p"/custom_fields"}>
-            <.icon name="hero-arrow-left" />
-          </.button>
-          <.button
-            variant="primary"
-            navigate={~p"/custom_fields/#{@custom_field}/edit?return_to=show"}
-          >
-            <.icon name="hero-pencil-square" /> Edit Custom field
-          </.button>
-        </:actions>
-      </.header>
-
-      <.list>
-        <:item title="Id">{@custom_field.id}</:item>
-
-        <:item title="Slug">
-          {@custom_field.slug}
-          <p class="mt-2 text-sm leading-6 text-zinc-600">
-            {gettext("Auto-generated identifier (immutable)")}
-          </p>
-        </:item>
-
-        <:item title="Name">{@custom_field.name}</:item>
-
-        <:item title="Description">{@custom_field.description}</:item>
-      </.list>
-    </Layouts.app>
-    """
-  end
-
-  @impl true
-  def mount(%{"id" => id}, _session, socket) do
-    {:ok,
-     socket
-     |> assign(:page_title, "Show Custom field")
-     |> assign(:custom_field, Ash.get!(Mv.Membership.CustomField, id))}
-  end
-end
diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex
index 0be4559..bb919cb 100644
--- a/lib/mv_web/live/global_settings_live.ex
+++ b/lib/mv_web/live/global_settings_live.ex
@@ -4,6 +4,7 @@ defmodule MvWeb.GlobalSettingsLive do
 
   ## Features
   - Edit the association/club name
+  - Manage custom fields
   - Real-time form validation
   - Success/error feedback
 
@@ -28,7 +29,7 @@ defmodule MvWeb.GlobalSettingsLive do
 
     {:ok,
      socket
-     |> assign(:page_title, gettext("Club Settings"))
+     |> assign(:page_title, gettext("Settings"))
      |> assign(:settings, settings)
      |> assign_form()}
   end
@@ -38,12 +39,16 @@ defmodule MvWeb.GlobalSettingsLive do
     ~H"""
     <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
-        {gettext("Club Settings")}
+        {gettext("Settings")}
         <:subtitle>
           {gettext("Manage global settings for the association.")}
         </:subtitle>
       </.header>
 
+      <%!-- Club Settings Section --%>
+      <.header>
+        {gettext("Club Settings")}
+      </.header>
       <.form for={@form} id="settings-form" phx-change="validate" phx-submit="save">
         <.input
           field={@form[:club_name]}
@@ -56,6 +61,12 @@ defmodule MvWeb.GlobalSettingsLive do
           {gettext("Save Settings")}
         </.button>
       </.form>
+
+      <%!-- Custom Fields Section --%>
+      <.live_component
+        module={MvWeb.CustomFieldLive.IndexComponent}
+        id="custom-fields-component"
+      />
     </Layouts.app>
     """
   end
@@ -66,6 +77,7 @@ defmodule MvWeb.GlobalSettingsLive do
      assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, setting_params))}
   end
 
+  @impl true
   def handle_event("save", %{"setting" => setting_params}, socket) do
     case AshPhoenix.Form.submit(socket.assigns.form, params: setting_params) do
       {:ok, updated_settings} ->
@@ -82,6 +94,37 @@ defmodule MvWeb.GlobalSettingsLive do
     end
   end
 
+  @impl true
+  def handle_info({:custom_field_saved, _custom_field, action}, socket) do
+    send_update(MvWeb.CustomFieldLive.IndexComponent,
+      id: "custom-fields-component",
+      show_form: false
+    )
+
+    {:noreply,
+     put_flash(socket, :info, gettext("Custom field %{action} successfully", action: action))}
+  end
+
+  @impl true
+  def handle_info({:custom_field_deleted, _custom_field}, socket) do
+    {:noreply, put_flash(socket, :info, gettext("Custom field deleted successfully"))}
+  end
+
+  @impl true
+  def handle_info({:custom_field_delete_error, error}, socket) do
+    {:noreply,
+     put_flash(
+       socket,
+       :error,
+       gettext("Failed to delete custom field: %{error}", error: inspect(error))
+     )}
+  end
+
+  @impl true
+  def handle_info(:custom_field_slug_mismatch, socket) do
+    {:noreply, put_flash(socket, :error, gettext("Slug does not match. Deletion cancelled."))}
+  end
+
   defp assign_form(%{assigns: %{settings: settings}} = socket) do
     form =
       AshPhoenix.Form.for_update(
diff --git a/lib/mv_web/router.ex b/lib/mv_web/router.ex
index c574e17..d6f108e 100644
--- a/lib/mv_web/router.ex
+++ b/lib/mv_web/router.ex
@@ -55,12 +55,6 @@ defmodule MvWeb.Router do
       live "/members/:id", MemberLive.Show, :show
       live "/members/:id/show/edit", MemberLive.Show, :edit
 
-      live "/custom_fields", CustomFieldLive.Index, :index
-      live "/custom_fields/new", CustomFieldLive.Form, :new
-      live "/custom_fields/:id/edit", CustomFieldLive.Form, :edit
-      live "/custom_fields/:id", CustomFieldLive.Show, :show
-      live "/custom_fields/:id/show/edit", CustomFieldLive.Show, :edit
-
       live "/custom_field_values", CustomFieldValueLive.Index, :index
       live "/custom_field_values/new", CustomFieldValueLive.Form, :new
       live "/custom_field_values/:id/edit", CustomFieldValueLive.Form, :edit
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 82fbabe..3f80877 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -34,6 +34,7 @@ msgid "City"
 msgstr "Stadt"
 
 #: lib/mv_web/live/contribution_type_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
@@ -41,6 +42,7 @@ msgid "Delete"
 msgstr "Löschen"
 
 #: lib/mv_web/live/contribution_type_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
@@ -154,7 +156,7 @@ msgstr "Postleitzahl"
 msgid "Save Member"
 msgstr "Mitglied speichern"
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/member_live/form.ex
@@ -169,6 +171,7 @@ msgstr "Speichern..."
 msgid "Street"
 msgstr "Straße"
 
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -181,6 +184,7 @@ msgstr "Nein"
 msgid "Show Member"
 msgstr "Mitglied anzeigen"
 
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -188,14 +192,14 @@ msgstr "Mitglied anzeigen"
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr "erstellt"
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
@@ -237,8 +241,8 @@ msgstr "Ihre E-Mail-Adresse wurde bestätigt"
 msgid "Your password has successfully been reset"
 msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt"
 
-#: lib/mv_web/live/custom_field_live/form.ex
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
@@ -251,7 +255,8 @@ msgstr "Abbrechen"
 msgid "Choose a member"
 msgstr "Mitglied auswählen"
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Beschreibung"
@@ -266,7 +271,7 @@ msgstr "Benutzer*in bearbeiten"
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr "Unveränderlich"
@@ -296,7 +301,8 @@ msgid "Members"
 msgstr "Mitglieder"
 
 #: lib/mv_web/live/contribution_type_live/index.ex
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr "Name"
@@ -327,7 +333,7 @@ msgstr "Passwort-Authentifizierung"
 msgid "Profil"
 msgstr "Profil"
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr "Erforderlich"
@@ -343,6 +349,7 @@ msgid "Select member"
 msgstr "Mitglied auswählen"
 
 #: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr "Einstellungen"
@@ -383,7 +390,7 @@ msgstr "Benutzer*in"
 msgid "Value"
 msgstr "Wert"
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr "Wertetyp"
@@ -579,7 +586,7 @@ msgstr "Wähle ein Benutzerdefiniertes Feld"
 msgid "Custom field"
 msgstr "Benutzerdefinierte Felder"
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr "Benutzerdefiniertes Feld erfolgreich %{action}"
@@ -594,7 +601,7 @@ msgstr "Benutzerdefinierter Feldwert erfolgreich %{action}"
 msgid "Please select a custom field first"
 msgstr "Bitte wähle zuerst ein Benutzerdefiniertes Feld"
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr "Benutzerdefiniertes Feld speichern"
@@ -604,12 +611,7 @@ msgstr "Benutzerdefiniertes Feld speichern"
 msgid "Save Custom field value"
 msgstr "Benutzerdefinierten Feldwert speichern"
 
-#: lib/mv_web/live/custom_field_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Use this form to manage custom_field records in your database."
-msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten."
-
-#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
@@ -621,44 +623,39 @@ msgstr "Benutzerdefinierte Felder"
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr "Verwende dieses Formular, um Benutzerdefinierte Feldwerte in deiner Datenbank zu verwalten."
 
-#: lib/mv_web/live/custom_field_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Auto-generated identifier (immutable)"
-msgstr "Automatisch generierter Bezeichner (unveränderlich)"
-
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] "%{count} Mitglied hat einen Wert für dieses benutzerdefinierte Feld zugewiesen."
 msgstr[1] "%{count} Mitglieder haben Werte für dieses benutzerdefinierte Feld zugewiesen."
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr "Alle benutzerdefinierten Feldwerte werden beim Löschen dieses benutzerdefinierten Feldes dauerhaft gelöscht."
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr "Benutzerdefiniertes Feld löschen"
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr "Benutzerdefiniertes Feld und alle Werte löschen"
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr "Obigen Text zur Bestätigung eingeben"
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "To confirm deletion, please enter this text:"
 msgstr "Um die Löschung zu bestätigen, gib bitte folgenden Text ein:"
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr "In der Mitglieder-Übersicht anzeigen"
@@ -1322,6 +1319,61 @@ msgstr ""
 msgid "Yearly Interval - Joining Period Included"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "Back to custom field overview"
+msgstr "Zurück zur Felderliste"
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Custom field deleted successfully"
+msgstr "Benutzerdefiniertes Feld erfolgreich %{action}"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Edit Custom Field"
+msgstr "Benutzerdefiniertes Feld löschen"
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Failed to delete custom field: %{error}"
+msgstr "Konnte Feld nicht löschen: %{error}"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom Field"
+msgstr "Benutzerdefiniertes Feld speichern"
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom field"
+msgstr "Benutzerdefiniertes Feld speichern"
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Show in Overview"
+msgstr "In der Mitglieder-Übersicht anzeigen"
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Slug does not match. Deletion cancelled."
+msgstr "Eingegebener Text war nicht korrekt. Vorgang abgebrochen."
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format
+msgid "These will appear in addition to other data when adding new members."
+msgstr "Diese Felder können zusätzlich zu den normalen Daten ausgefüllt werden, wenn ein neues Mitglied angelegt wird."
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Value Type"
+msgstr "Wertetyp"
+
+#~ #: lib/mv_web/live/custom_field_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Auto-generated identifier (immutable)"
+#~ msgstr "Automatisch generierter Bezeichner (unveränderlich)"
+
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
@@ -1366,3 +1418,8 @@ msgstr ""
 #~ #, elixir-autogen, elixir-format
 #~ msgid "This is a member record from your database."
 #~ msgstr "Dies ist ein Mitglied aus deiner Datenbank."
+
+#~ #: lib/mv_web/live/custom_field_live/form.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Use this form to manage custom_field records in your database."
+#~ msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten."
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 5f94e73..9a479c6 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -35,6 +35,7 @@ msgid "City"
 msgstr ""
 
 #: lib/mv_web/live/contribution_type_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
@@ -42,6 +43,7 @@ msgid "Delete"
 msgstr ""
 
 #: lib/mv_web/live/contribution_type_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
@@ -155,7 +157,7 @@ msgstr ""
 msgid "Save Member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/member_live/form.ex
@@ -170,6 +172,7 @@ msgstr ""
 msgid "Street"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -182,6 +185,7 @@ msgstr ""
 msgid "Show Member"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -189,14 +193,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
@@ -238,8 +242,8 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
@@ -252,7 +256,8 @@ msgstr ""
 msgid "Choose a member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -267,7 +272,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
@@ -297,7 +302,8 @@ msgid "Members"
 msgstr ""
 
 #: lib/mv_web/live/contribution_type_live/index.ex
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -328,7 +334,7 @@ msgstr ""
 msgid "Profil"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr ""
@@ -344,6 +350,7 @@ msgid "Select member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -384,7 +391,7 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr ""
@@ -580,7 +587,7 @@ msgstr ""
 msgid "Custom field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr ""
@@ -595,7 +602,7 @@ msgstr ""
 msgid "Please select a custom field first"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr ""
@@ -605,12 +612,7 @@ msgstr ""
 msgid "Save Custom field value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Use this form to manage custom_field records in your database."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
@@ -622,44 +624,39 @@ msgstr ""
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Auto-generated identifier (immutable)"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "To confirm deletion, please enter this text:"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr ""
@@ -1322,3 +1319,53 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Period Included"
 msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "Back to custom field overview"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Custom field deleted successfully"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "Edit Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Failed to delete custom field: %{error}"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "New Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format
+msgid "New Custom field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format
+msgid "Show in Overview"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Slug does not match. Deletion cancelled."
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format
+msgid "These will appear in addition to other data when adding new members."
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format
+msgid "Value Type"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 47896b4..3d80e4d 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -35,6 +35,7 @@ msgid "City"
 msgstr ""
 
 #: lib/mv_web/live/contribution_type_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/index.html.heex
 #, elixir-autogen, elixir-format
@@ -42,6 +43,7 @@ msgid "Delete"
 msgstr ""
 
 #: lib/mv_web/live/contribution_type_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
@@ -155,7 +157,7 @@ msgstr ""
 msgid "Save Member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/member_live/form.ex
@@ -170,6 +172,7 @@ msgstr ""
 msgid "Street"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -182,6 +185,7 @@ msgstr ""
 msgid "Show Member"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/formatter.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -189,14 +193,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
@@ -238,8 +242,8 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/custom_field_value_live/form.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
@@ -252,7 +256,8 @@ msgstr ""
 msgid "Choose a member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -267,7 +272,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
@@ -297,7 +302,8 @@ msgid "Members"
 msgstr ""
 
 #: lib/mv_web/live/contribution_type_live/index.ex
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -328,7 +334,7 @@ msgstr ""
 msgid "Profil"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr ""
@@ -344,6 +350,7 @@ msgid "Select member"
 msgstr ""
 
 #: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -384,7 +391,7 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr ""
@@ -580,7 +587,7 @@ msgstr ""
 msgid "Custom field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr ""
@@ -595,7 +602,7 @@ msgstr ""
 msgid "Please select a custom field first"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr ""
@@ -605,12 +612,7 @@ msgstr ""
 msgid "Save Custom field value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Use this form to manage custom_field records in your database."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
@@ -622,44 +624,39 @@ msgstr ""
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Auto-generated identifier (immutable)"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex
+#: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "To confirm deletion, please enter this text:"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex
+#: lib/mv_web/live/custom_field_live/form_component.ex
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr ""
@@ -1323,6 +1320,61 @@ msgstr ""
 msgid "Yearly Interval - Joining Period Included"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "Back to custom field overview"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Custom field deleted successfully"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Edit Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Failed to delete custom field: %{error}"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Show in Overview"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Slug does not match. Deletion cancelled."
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format
+msgid "These will appear in addition to other data when adding new members."
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Value Type"
+msgstr ""
+
+#~ #: lib/mv_web/live/custom_field_live/show.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Auto-generated identifier (immutable)"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
@@ -1365,3 +1417,8 @@ msgstr ""
 #~ #, elixir-autogen, elixir-format
 #~ msgid "This is a member record from your database."
 #~ msgstr ""
+
+#~ #: lib/mv_web/live/custom_field_live/form.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Use this form to manage custom_field records in your database."
+#~ msgstr ""
diff --git a/test/membership/member_field_visibility_test.exs b/test/membership/member_field_visibility_test.exs
deleted file mode 100644
index 9963169..0000000
--- a/test/membership/member_field_visibility_test.exs
+++ /dev/null
@@ -1,14 +0,0 @@
-defmodule Mv.Membership.MemberFieldVisibilityTest do
-  @moduledoc """
-  Tests for member field visibility configuration.
-
-  Tests cover:
-  - Member fields are visible by default (show_in_overview: true)
-  - Member fields can be hidden (show_in_overview: false)
-  - Checking if a specific field is visible
-  - Configuration is stored in Settings resource
-  """
-  use Mv.DataCase, async: true
-
-  alias Mv.Membership.Member
-end
diff --git a/test/mv_web/live/custom_field_live/deletion_test.exs b/test/mv_web/live/custom_field_live/deletion_test.exs
index f0317e0..322cf38 100644
--- a/test/mv_web/live/custom_field_live/deletion_test.exs
+++ b/test/mv_web/live/custom_field_live/deletion_test.exs
@@ -1,6 +1,7 @@
 defmodule MvWeb.CustomFieldLive.DeletionTest do
   @moduledoc """
-  Tests for CustomFieldLive.Index deletion modal and slug confirmation.
+  Tests for CustomFieldLive.IndexComponent deletion modal and slug confirmation.
+  Tests the custom field management component embedded in the settings page.
 
   Tests cover:
   - Opening deletion confirmation modal
@@ -39,11 +40,11 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       # Create custom field value
       create_custom_field_value(member, custom_field, "test")
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
-      # Click delete button
+      # Click delete button - find the delete link within the component
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
       # Modal should be visible
@@ -65,10 +66,10 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       create_custom_field_value(member1, custom_field, "test1")
       create_custom_field_value(member2, custom_field, "test2")
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
       # Should show plural form
@@ -78,10 +79,10 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     test "shows 0 members for custom field without values", %{conn: conn} do
       {:ok, _custom_field} = create_custom_field("test_field", :string)
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
       # Should show 0 members
@@ -93,15 +94,16 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     test "updates confirmation state when typing", %{conn: conn} do
       {:ok, custom_field} = create_custom_field("test_field", :string)
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
-      # Type in slug input
+      # Type in slug input - use element to find the form with phx-target
       view
-      |> render_change("update_slug_confirmation", %{"slug" => custom_field.slug})
+      |> element("#delete-custom-field-modal form")
+      |> render_change(%{"slug" => custom_field.slug})
 
       # Confirm button should be enabled now (no disabled attribute)
       html = render(view)
@@ -111,15 +113,16 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     test "delete button is disabled when slug doesn't match", %{conn: conn} do
       {:ok, _custom_field} = create_custom_field("test_field", :string)
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
-      # Type wrong slug
+      # Type wrong slug - use element to find the form with phx-target
       view
-      |> render_change("update_slug_confirmation", %{"slug" => "wrong-slug"})
+      |> element("#delete-custom-field-modal form")
+      |> render_change(%{"slug" => "wrong-slug"})
 
       # Button should be disabled
       html = render(view)
@@ -133,20 +136,21 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       {:ok, custom_field} = create_custom_field("test_field", :string)
       {:ok, custom_field_value} = create_custom_field_value(member, custom_field, "test")
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       # Open modal
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
-      # Enter correct slug
+      # Enter correct slug - use element to find the form with phx-target
       view
-      |> render_change("update_slug_confirmation", %{"slug" => custom_field.slug})
+      |> element("#delete-custom-field-modal form")
+      |> render_change(%{"slug" => custom_field.slug})
 
       # Click confirm
       view
-      |> element("button", "Delete Custom Field and All Values")
+      |> element("#delete-custom-field-modal button", "Delete Custom Field and All Values")
       |> render_click()
 
       # Should show success message
@@ -162,27 +166,28 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
       assert {:ok, _} = Ash.get(Member, member.id)
     end
 
-    test "shows error when slug doesn't match", %{conn: conn} do
+    test "button remains disabled and custom field not deleted when slug doesn't match", %{
+      conn: conn
+    } do
       {:ok, custom_field} = create_custom_field("test_field", :string)
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
-      # Enter wrong slug
+      # Enter wrong slug - use element to find the form with phx-target
       view
-      |> render_change("update_slug_confirmation", %{"slug" => "wrong-slug"})
+      |> element("#delete-custom-field-modal form")
+      |> render_change(%{"slug" => "wrong-slug"})
 
-      # Try to confirm (button should be disabled, but test the handler anyway)
-      view
-      |> render_click("confirm_delete", %{})
+      # Button should be disabled and we cannot click it
+      # The test verifies that the button is properly disabled in the UI
+      html = render(view)
+      assert html =~ ~r/disabled(?:=""|(?!\w))/
 
-      # Should show error message
-      assert render(view) =~ "Slug does not match"
-
-      # Custom field should still exist
+      # Custom field should still exist since deletion couldn't proceed
       assert {:ok, _} = Ash.get(CustomField, custom_field.id)
     end
   end
@@ -191,10 +196,10 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     test "closes modal without deleting", %{conn: conn} do
       {:ok, custom_field} = create_custom_field("test_field", :string)
 
-      {:ok, view, _html} = live(conn, ~p"/custom_fields")
+      {:ok, view, _html} = live(conn, ~p"/settings")
 
       view
-      |> element("a", "Delete")
+      |> element("#custom-fields-component a", "Delete")
       |> render_click()
 
       # Modal should be visible
@@ -202,7 +207,7 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
 
       # Click cancel
       view
-      |> element("button", "Cancel")
+      |> element("#delete-custom-field-modal button", "Cancel")
       |> render_click()
 
       # Modal should be gone
diff --git a/test/mv_web/live/profile_navigation_test.exs b/test/mv_web/live/profile_navigation_test.exs
index 5ba5eb0..4b383c6 100644
--- a/test/mv_web/live/profile_navigation_test.exs
+++ b/test/mv_web/live/profile_navigation_test.exs
@@ -148,8 +148,6 @@ defmodule MvWeb.ProfileNavigationTest do
       "/members/new",
       "/custom_field_values",
       "/custom_field_values/new",
-      "/custom_fields",
-      "/custom_fields/new",
       "/users",
       "/users/new"
     ]