diff --git a/frontend/shells/meldestelle-portal/src/commonMain/kotlin/MainApp.kt b/frontend/shells/meldestelle-portal/src/commonMain/kotlin/MainApp.kt
index 68136786..29d900ba 100644
--- a/frontend/shells/meldestelle-portal/src/commonMain/kotlin/MainApp.kt
+++ b/frontend/shells/meldestelle-portal/src/commonMain/kotlin/MainApp.kt
@@ -161,8 +161,6 @@ fun MainApp() {
             }
           }
         )
-
-        else -> { navigationPort.navigateToScreen(AppScreen.Landing) }
       }
     }
   }
@@ -1260,7 +1258,7 @@ private fun OrganizerProfileScreen(
             text = authState.username ?: "",
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = androidx.compose.ui.Modifier.padding(end = 8.dp)
+            modifier = Modifier.padding(end = 8.dp)
           )
           TextButton(onClick = onLogout) { Text("Abmelden") }
         }
@@ -1268,7 +1266,7 @@ private fun OrganizerProfileScreen(
     }
   ) { paddingValues ->
     Column(
-      modifier = androidx.compose.ui.Modifier
+      modifier = Modifier
         .fillMaxSize()
         .padding(paddingValues)
         .verticalScroll(scrollState)
@@ -1277,19 +1275,19 @@ private fun OrganizerProfileScreen(
     ) {
 
       // --- Logo & Vereinsname ---
-      Card(modifier = androidx.compose.ui.Modifier.fillMaxWidth()) {
-        Column(modifier = androidx.compose.ui.Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
+      Card(modifier = Modifier.fillMaxWidth()) {
+        Column(modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
           Text("Verein / Veranstalter", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
 
           // Logo Placeholder
           Surface(
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth(),
             shape = MaterialTheme.shapes.medium,
             color = MaterialTheme.colorScheme.surfaceVariant,
             border = androidx.compose.foundation.BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant)
           ) {
             Column(
-              modifier = androidx.compose.ui.Modifier.padding(24.dp).fillMaxWidth(),
+              modifier = Modifier.padding(24.dp).fillMaxWidth(),
               horizontalAlignment = Alignment.CenterHorizontally,
               verticalArrangement = Arrangement.spacedBy(8.dp)
             ) {
@@ -1313,7 +1311,7 @@ private fun OrganizerProfileScreen(
             onValueChange = { vereinskuerzel = it },
             label = { Text("Kürzel") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           OutlinedTextField(
             value = vereinsbeschreibung,
@@ -1321,14 +1319,14 @@ private fun OrganizerProfileScreen(
             label = { Text("Kurzbeschreibung / Über uns") },
             minLines = 3,
             maxLines = 6,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
         }
       }
 
       // --- Adresse ---
-      Card(modifier = androidx.compose.ui.Modifier.fillMaxWidth()) {
-        Column(modifier = androidx.compose.ui.Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
+      Card(modifier = Modifier.fillMaxWidth()) {
+        Column(modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
           Text("Adresse", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
 
           OutlinedTextField(
@@ -1336,7 +1334,7 @@ private fun OrganizerProfileScreen(
             onValueChange = { adresse = it },
             label = { Text("Straße & Hausnummer") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
             OutlinedTextField(
@@ -1344,14 +1342,14 @@ private fun OrganizerProfileScreen(
               onValueChange = { plz = it },
               label = { Text("PLZ") },
               singleLine = true,
-              modifier = androidx.compose.ui.Modifier.width(100.dp)
+              modifier = Modifier.width(100.dp)
             )
             OutlinedTextField(
               value = ort,
               onValueChange = { ort = it },
               label = { Text("Ort") },
               singleLine = true,
-              modifier = androidx.compose.ui.Modifier.weight(1f)
+              modifier = Modifier.weight(1f)
             )
           }
           OutlinedTextField(
@@ -1359,7 +1357,7 @@ private fun OrganizerProfileScreen(
             onValueChange = { land = it },
             label = { Text("Land") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           OutlinedTextField(
             value = mapsLink,
@@ -1367,14 +1365,14 @@ private fun OrganizerProfileScreen(
             label = { Text("Google Maps / OpenStreetMap Link") },
             placeholder = { Text("https://maps.google.com/...") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
         }
       }
 
       // --- Ansprechpersonen ---
-      Card(modifier = androidx.compose.ui.Modifier.fillMaxWidth()) {
-        Column(modifier = androidx.compose.ui.Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
+      Card(modifier = Modifier.fillMaxWidth()) {
+        Column(modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
           Text("Ansprechpersonen", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
 
           Text("Hauptkontakt", style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.primary)
@@ -1383,21 +1381,21 @@ private fun OrganizerProfileScreen(
             onValueChange = { kontakt1Name = it },
             label = { Text("Name") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           OutlinedTextField(
             value = kontakt1Email,
             onValueChange = { kontakt1Email = it },
             label = { Text("E-Mail") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           OutlinedTextField(
             value = kontakt1Telefon,
             onValueChange = { kontakt1Telefon = it },
             label = { Text("Telefon / Mobil") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
 
           HorizontalDivider()
@@ -1408,28 +1406,28 @@ private fun OrganizerProfileScreen(
             onValueChange = { kontakt2Name = it },
             label = { Text("Name") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           OutlinedTextField(
             value = kontakt2Email,
             onValueChange = { kontakt2Email = it },
             label = { Text("E-Mail") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           OutlinedTextField(
             value = kontakt2Telefon,
             onValueChange = { kontakt2Telefon = it },
             label = { Text("Telefon / Mobil") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
         }
       }
 
       // --- Social Media & Links ---
-      Card(modifier = androidx.compose.ui.Modifier.fillMaxWidth()) {
-        Column(modifier = androidx.compose.ui.Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
+      Card(modifier = Modifier.fillMaxWidth()) {
+        Column(modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
           Text("Links & Social Media", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
 
           OutlinedTextField(
@@ -1438,7 +1436,7 @@ private fun OrganizerProfileScreen(
             label = { Text("Webseite") },
             placeholder = { Text("https://www.meinverein.at") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           OutlinedTextField(
             value = facebook,
@@ -1446,7 +1444,7 @@ private fun OrganizerProfileScreen(
             label = { Text("Facebook") },
             placeholder = { Text("https://facebook.com/...") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           OutlinedTextField(
             value = instagram,
@@ -1454,7 +1452,7 @@ private fun OrganizerProfileScreen(
             label = { Text("Instagram") },
             placeholder = { Text("https://instagram.com/...") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           OutlinedTextField(
             value = youtube,
@@ -1462,14 +1460,14 @@ private fun OrganizerProfileScreen(
             label = { Text("YouTube") },
             placeholder = { Text("https://youtube.com/...") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
         }
       }
 
       // --- Weitere Vereinsdaten ---
-      Card(modifier = androidx.compose.ui.Modifier.fillMaxWidth()) {
-        Column(modifier = androidx.compose.ui.Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
+      Card(modifier = Modifier.fillMaxWidth()) {
+        Column(modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
           Text("Weitere Informationen", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
 
           OutlinedTextField(
@@ -1478,14 +1476,14 @@ private fun OrganizerProfileScreen(
             label = { Text("IBAN / Bankverbindung") },
             placeholder = { Text("AT12 3456 7890 1234 5678") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
           OutlinedTextField(
             value = uid,
             onValueChange = { uid = it },
             label = { Text("UID-Nummer / ZVR-Zahl") },
             singleLine = true,
-            modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
           )
         }
       }
@@ -1494,11 +1492,11 @@ private fun OrganizerProfileScreen(
       if (saveSuccess) {
         Card(
           colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
-          modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+          modifier = Modifier.fillMaxWidth()
         ) {
           Text(
             "✓ Profil erfolgreich gespeichert!",
-            modifier = androidx.compose.ui.Modifier.padding(16.dp),
+            modifier = Modifier.padding(16.dp),
             color = MaterialTheme.colorScheme.onPrimaryContainer,
             style = MaterialTheme.typography.bodyLarge
           )
@@ -1510,19 +1508,19 @@ private fun OrganizerProfileScreen(
           // TODO: Backend-Anbindung (PUT /api/organizer/profile)
           saveSuccess = true
         },
-        modifier = androidx.compose.ui.Modifier.fillMaxWidth().height(52.dp)
+        modifier = Modifier.fillMaxWidth().height(52.dp)
       ) {
         Text("Profil speichern", style = MaterialTheme.typography.titleMedium)
       }
 
       OutlinedButton(
         onClick = onNavigateToDashboard,
-        modifier = androidx.compose.ui.Modifier.fillMaxWidth()
+        modifier = Modifier.fillMaxWidth()
       ) {
         Text("Zum Dashboard")
       }
 
-      Spacer(modifier = androidx.compose.ui.Modifier.height(24.dp))
+      Spacer(modifier = Modifier.height(24.dp))
     }
   }
 }