diff --git a/backend/locale/en/LC_MESSAGES/django.po b/backend/locale/en/LC_MESSAGES/django.po
index 65605e6..0268d95 100644
--- a/backend/locale/en/LC_MESSAGES/django.po
+++ b/backend/locale/en/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tubco-portal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-03-27 22:03+0000\n"
+"POT-Creation-Date: 2026-03-27 22:05+0000\n"
 "PO-Revision-Date: 2026-03-24 00:00+0000\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgstr "Search"
 #: workflows/app_registry.py:62
 #: workflows/templates/workflows/app_registry.html:32
 #: workflows/templates/workflows/backup_recovery.html:72
-#: workflows/templates/workflows/form_builder.html:436
+#: workflows/templates/workflows/form_builder.html:430
 #: workflows/templates/workflows/job_monitor.html:68
 #: workflows/templates/workflows/job_monitor.html:89
 #: workflows/templates/workflows/onboarding_intro_session.html:37
@@ -225,7 +225,7 @@ msgstr "Manage scheduled welcome emails."
 
 #: workflows/app_registry.py:158
 #: workflows/templates/workflows/form_builder.html:5
-#: workflows/templates/workflows/form_builder.html:77
+#: workflows/templates/workflows/form_builder.html:76
 msgid "Form Builder"
 msgstr "Form Builder"
 
@@ -581,8 +581,8 @@ msgstr "Introduction"
 msgid "System-Hinweise"
 msgstr "Introduction"
 
-#: workflows/forms.py:418 workflows/templates/workflows/form_builder.html:41
-#: workflows/templates/workflows/form_builder.html:102
+#: workflows/forms.py:418 workflows/templates/workflows/form_builder.html:40
+#: workflows/templates/workflows/form_builder.html:100
 #, fuzzy
 #| msgid "Workflow-Regeln"
 msgid "Workflow"
@@ -1536,12 +1536,12 @@ msgstr ""
 #: workflows/templates/workflows/account_profile.html:262
 #: workflows/templates/workflows/app_registry.html:35
 #: workflows/templates/workflows/app_registry.html:84
-#: workflows/templates/workflows/form_builder.html:111
-#: workflows/templates/workflows/form_builder.html:426
-#: workflows/templates/workflows/form_builder.html:437
-#: workflows/templates/workflows/form_builder.html:564
-#: workflows/templates/workflows/form_builder.html:718
-#: workflows/templates/workflows/form_builder.html:862
+#: workflows/templates/workflows/form_builder.html:109
+#: workflows/templates/workflows/form_builder.html:420
+#: workflows/templates/workflows/form_builder.html:431
+#: workflows/templates/workflows/form_builder.html:558
+#: workflows/templates/workflows/form_builder.html:712
+#: workflows/templates/workflows/form_builder.html:856
 #: workflows/templates/workflows/integrations_setup.html:263
 #: workflows/templates/workflows/intro_builder.html:65
 #: workflows/templates/workflows/trial_management.html:28
@@ -1730,10 +1730,10 @@ msgstr "Last updated"
 
 #: workflows/templates/workflows/app_registry.html:4
 #: workflows/templates/workflows/app_registry.html:103
-#: workflows/templates/workflows/form_builder.html:692
-#: workflows/templates/workflows/form_builder.html:733
-#: workflows/templates/workflows/form_builder.html:796
-#: workflows/templates/workflows/form_builder.html:885
+#: workflows/templates/workflows/form_builder.html:686
+#: workflows/templates/workflows/form_builder.html:727
+#: workflows/templates/workflows/form_builder.html:790
+#: workflows/templates/workflows/form_builder.html:879
 #: workflows/templates/workflows/intro_builder.html:58
 msgid "Sortierung"
 msgstr "Sort order"
@@ -1985,8 +1985,8 @@ msgid "Zeit"
 msgstr ""
 
 #: workflows/templates/workflows/audit_log.html:55
-#: workflows/templates/workflows/form_builder.html:788
-#: workflows/templates/workflows/form_builder.html:877
+#: workflows/templates/workflows/form_builder.html:782
+#: workflows/templates/workflows/form_builder.html:871
 #: workflows/templates/workflows/request_timeline.html:68
 #: workflows/templates/workflows/requests_dashboard.html:128
 #: workflows/templates/workflows/requests_dashboard.html:188
@@ -2223,9 +2223,9 @@ msgid "Backup-Bundle wirklich löschen?"
 msgstr "Delete this backup bundle?"
 
 #: workflows/templates/workflows/backup_recovery.html:133
-#: workflows/templates/workflows/form_builder.html:566
-#: workflows/templates/workflows/form_builder.html:720
-#: workflows/templates/workflows/form_builder.html:865
+#: workflows/templates/workflows/form_builder.html:560
+#: workflows/templates/workflows/form_builder.html:714
+#: workflows/templates/workflows/form_builder.html:859
 #: workflows/templates/workflows/integrations_setup.html:265
 #: workflows/templates/workflows/intro_builder.html:66
 #: workflows/templates/workflows/intro_builder.html:102
@@ -2362,680 +2362,656 @@ msgstr ""
 msgid "Formularsteuerung"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:19
-msgid ""
-"Arbeiten Sie blockweise: zuerst Struktur, dann Regeln, danach Inhalte und "
-"Erweiterungen."
-msgstr ""
-
-#: workflows/templates/workflows/form_builder.html:22
+#: workflows/templates/workflows/form_builder.html:21
 msgid "Builder Navigation"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:24
-#: workflows/templates/workflows/form_builder.html:129 workflows/views.py:2996
+#: workflows/templates/workflows/form_builder.html:23
+#: workflows/templates/workflows/form_builder.html:124 workflows/views.py:2996
 #, fuzzy
 #| msgid "Reihenfolge speichern"
 msgid "Struktur & Reihenfolge"
 msgstr "Save order"
 
-#: workflows/templates/workflows/form_builder.html:25
-#: workflows/templates/workflows/form_builder.html:133
-#: workflows/templates/workflows/form_builder.html:163
-#: workflows/templates/workflows/form_builder.html:227
-#: workflows/templates/workflows/form_builder.html:244 workflows/views.py:2997
+#: workflows/templates/workflows/form_builder.html:24
+#: workflows/templates/workflows/form_builder.html:128
+#: workflows/templates/workflows/form_builder.html:157
+#: workflows/templates/workflows/form_builder.html:221
+#: workflows/templates/workflows/form_builder.html:238 workflows/views.py:2997
 #, fuzzy
 #| msgid "Abschnitt"
 msgid "Abschnitte"
 msgstr "Section"
 
-#: workflows/templates/workflows/form_builder.html:28
-#: workflows/templates/workflows/form_builder.html:217
+#: workflows/templates/workflows/form_builder.html:27
+#: workflows/templates/workflows/form_builder.html:211
 #, fuzzy
 #| msgid "Sicherheitsregeln"
 msgid "Sichtbarkeit & Regeln"
 msgstr "Safety rules"
 
-#: workflows/templates/workflows/form_builder.html:29
-#: workflows/templates/workflows/form_builder.html:221
+#: workflows/templates/workflows/form_builder.html:28
+#: workflows/templates/workflows/form_builder.html:215
 #, fuzzy
 #| msgid "Ausgeblendet"
 msgid "ausgeblendet"
 msgstr "Hidden"
 
-#: workflows/templates/workflows/form_builder.html:32
-#: workflows/templates/workflows/form_builder.html:499
+#: workflows/templates/workflows/form_builder.html:31
+#: workflows/templates/workflows/form_builder.html:493
 #, fuzzy
 #| msgid "Optionen verwalten"
 msgid "Optionen & Texte"
 msgstr "Manage options"
 
-#: workflows/templates/workflows/form_builder.html:33
-#: workflows/templates/workflows/form_builder.html:68
-#: workflows/templates/workflows/form_builder.html:153
-#: workflows/templates/workflows/form_builder.html:503
-#: workflows/templates/workflows/form_builder.html:758
+#: workflows/templates/workflows/form_builder.html:32
+#: workflows/templates/workflows/form_builder.html:67
+#: workflows/templates/workflows/form_builder.html:147
+#: workflows/templates/workflows/form_builder.html:497
+#: workflows/templates/workflows/form_builder.html:752
 #, fuzzy
 #| msgid "Feldtexte speichern"
 msgid "eigene Felder"
 msgstr "Save field text"
 
-#: workflows/templates/workflows/form_builder.html:38
+#: workflows/templates/workflows/form_builder.html:37
 #, fuzzy
 #| msgid "Abschnitt"
 msgid "Aktive Ansicht"
 msgstr "Section"
 
-#: workflows/templates/workflows/form_builder.html:45
-#: workflows/templates/workflows/form_builder.html:106
+#: workflows/templates/workflows/form_builder.html:44
+#: workflows/templates/workflows/form_builder.html:104
 msgid "Modul"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:50
+#: workflows/templates/workflows/form_builder.html:49
 msgid "Fokus"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:60
-#: workflows/templates/workflows/form_builder.html:134
+#: workflows/templates/workflows/form_builder.html:59
+#: workflows/templates/workflows/form_builder.html:129
 msgid "konfigurierbare Felder"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:64
-#: workflows/templates/workflows/form_builder.html:505
-#: workflows/templates/workflows/form_builder.html:670
+#: workflows/templates/workflows/form_builder.html:63
+#: workflows/templates/workflows/form_builder.html:499
+#: workflows/templates/workflows/form_builder.html:664
 #, fuzzy
 #| msgid "Abschnitt"
 msgid "eigene Abschnitte"
 msgstr "Section"
 
-#: workflows/templates/workflows/form_builder.html:76
+#: workflows/templates/workflows/form_builder.html:75
 msgid "Deployment Configuration"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:78
-msgid ""
-"Steuern Sie Struktur, Regeln und Inhalte Ihrer Standard-Workflows an einem "
-"Ort."
-msgstr ""
-
-#: workflows/templates/workflows/form_builder.html:95
+#: workflows/templates/workflows/form_builder.html:93
 msgid "Reihenfolge speichern"
 msgstr "Save order"
 
-#: workflows/templates/workflows/form_builder.html:99
+#: workflows/templates/workflows/form_builder.html:97
 #, fuzzy
 #| msgid "Testmodus"
 msgid "Arbeitskontext"
 msgstr "Test mode"
 
-#: workflows/templates/workflows/form_builder.html:117
-msgid ""
-"Arbeiten Sie jeweils nur in einem Bereich und speichern Sie Änderungen "
-"abschnittsweise."
-msgstr ""
-
-#: workflows/templates/workflows/form_builder.html:130
+#: workflows/templates/workflows/form_builder.html:125
 msgid ""
 "Ordnen Sie Abschnitte und Felder in der Reihenfolge, in der sie im Formular "
 "erscheinen sollen."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:141
+#: workflows/templates/workflows/form_builder.html:136
 #, fuzzy
 #| msgid "Testmodus"
 msgid "Arbeitsmodus"
 msgstr "Test mode"
 
-#: workflows/templates/workflows/form_builder.html:142
+#: workflows/templates/workflows/form_builder.html:137
 #, fuzzy
 #| msgid "Letzte Anmeldung"
 msgid "Direkte Anordnung"
 msgstr "Last login"
 
 #: workflows/templates/workflows/form_builder.html:143
-msgid ""
-"Verschieben Sie Felder direkt zwischen Abschnitten. Die Reihenfolge wird "
-"erst mit dem globalen Speichern oben übernommen."
-msgstr ""
-
-#: workflows/templates/workflows/form_builder.html:149
 #, fuzzy
 #| msgid "Abschnitt"
 msgid "aktive Abschnitte"
 msgstr "Section"
 
-#: workflows/templates/workflows/form_builder.html:157
+#: workflows/templates/workflows/form_builder.html:151
 #, fuzzy
 #| msgid "Ausgeblendet"
 msgid "ausgeblendete Felder"
 msgstr "Hidden"
 
-#: workflows/templates/workflows/form_builder.html:169
-#: workflows/templates/workflows/form_builder.html:182
-#: workflows/templates/workflows/form_builder.html:314
-#: workflows/templates/workflows/form_builder.html:325
-#: workflows/templates/workflows/form_builder.html:612
-#: workflows/templates/workflows/form_builder.html:833
-#: workflows/templates/workflows/form_builder.html:844
-#: workflows/templates/workflows/form_builder.html:943
+#: workflows/templates/workflows/form_builder.html:163
+#: workflows/templates/workflows/form_builder.html:176
+#: workflows/templates/workflows/form_builder.html:308
+#: workflows/templates/workflows/form_builder.html:319
+#: workflows/templates/workflows/form_builder.html:606
+#: workflows/templates/workflows/form_builder.html:827
+#: workflows/templates/workflows/form_builder.html:838
+#: workflows/templates/workflows/form_builder.html:937
 #, fuzzy, python-format
 #| msgid "Keine konfigurierten Felder in diesem Schritt."
 msgid "%(count)s Feld/Felder"
 msgstr "No configured fields in this step."
 
-#: workflows/templates/workflows/form_builder.html:184
+#: workflows/templates/workflows/form_builder.html:178
 #, fuzzy
 #| msgid "öffnen"
 msgid "Geöffnet"
 msgstr "open"
 
-#: workflows/templates/workflows/form_builder.html:194
+#: workflows/templates/workflows/form_builder.html:188
 msgid "Eigen"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:195
-#: workflows/templates/workflows/form_builder.html:279
-#: workflows/templates/workflows/form_builder.html:338
+#: workflows/templates/workflows/form_builder.html:189
+#: workflows/templates/workflows/form_builder.html:273
+#: workflows/templates/workflows/form_builder.html:332
 msgid "Fix"
 msgstr "Fixed"
 
-#: workflows/templates/workflows/form_builder.html:196
-#: workflows/templates/workflows/form_builder.html:281
-#: workflows/templates/workflows/form_builder.html:340
+#: workflows/templates/workflows/form_builder.html:190
+#: workflows/templates/workflows/form_builder.html:275
+#: workflows/templates/workflows/form_builder.html:334
 msgid "Ausgeblendet"
 msgstr "Hidden"
 
-#: workflows/templates/workflows/form_builder.html:197
-#: workflows/templates/workflows/form_builder.html:342
-#: workflows/templates/workflows/form_builder.html:355
-#: workflows/templates/workflows/form_builder.html:358
-#: workflows/templates/workflows/form_builder.html:858
+#: workflows/templates/workflows/form_builder.html:191
+#: workflows/templates/workflows/form_builder.html:336
+#: workflows/templates/workflows/form_builder.html:349
+#: workflows/templates/workflows/form_builder.html:352
+#: workflows/templates/workflows/form_builder.html:852
 msgid "Pflicht"
 msgstr "Required"
 
-#: workflows/templates/workflows/form_builder.html:201
+#: workflows/templates/workflows/form_builder.html:195
 #, fuzzy
 #| msgid "Keine konfigurierten Felder in diesem Schritt."
 msgid "Noch keine Felder in diesem Abschnitt."
 msgstr "No configured fields in this step."
 
-#: workflows/templates/workflows/form_builder.html:218
+#: workflows/templates/workflows/form_builder.html:212
 msgid ""
 "Legen Sie fest, welche Teile sichtbar, erforderlich oder regelgesteuert sein "
 "sollen."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:222
+#: workflows/templates/workflows/form_builder.html:216
 #, fuzzy
 #| msgid "Abschnitt"
 msgid "versteckte Abschnitte"
 msgstr "Section"
 
-#: workflows/templates/workflows/form_builder.html:226
+#: workflows/templates/workflows/form_builder.html:220
 #, fuzzy
 #| msgid "Regelname"
 msgid "Regelmodule"
 msgstr "Rule name"
 
-#: workflows/templates/workflows/form_builder.html:228 workflows/views.py:2998
+#: workflows/templates/workflows/form_builder.html:222 workflows/views.py:2998
 #, fuzzy
 #| msgid "Feldtexte verwalten"
 msgid "Feldregeln"
 msgstr "Manage field text"
 
-#: workflows/templates/workflows/form_builder.html:230
-#: workflows/templates/workflows/form_builder.html:384 workflows/views.py:2999
+#: workflows/templates/workflows/form_builder.html:224
+#: workflows/templates/workflows/form_builder.html:378 workflows/views.py:2999
 msgid "Bedingte Logik"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:240
+#: workflows/templates/workflows/form_builder.html:234
 #, fuzzy
 #| msgid "Abschnitt"
 msgid "Abschnitte steuern"
 msgstr "Section"
 
-#: workflows/templates/workflows/form_builder.html:241
+#: workflows/templates/workflows/form_builder.html:235
 msgid "Reihenfolge und Sichtbarkeit der Formularabschnitte."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:258
+#: workflows/templates/workflows/form_builder.html:252
 #, fuzzy
 #| msgid "Reihenfolge speichern"
 msgid "Nach oben"
 msgstr "Save order"
 
-#: workflows/templates/workflows/form_builder.html:261
+#: workflows/templates/workflows/form_builder.html:255
 msgid "Nach unten"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:267
+#: workflows/templates/workflows/form_builder.html:261
 #, fuzzy, python-format
 #| msgid "Keine konfigurierten Felder in diesem Schritt."
 msgid "%(count)s Feld/Felder in diesem Abschnitt."
 msgstr "No configured fields in this step."
 
-#: workflows/templates/workflows/form_builder.html:280
-#: workflows/templates/workflows/form_builder.html:351
+#: workflows/templates/workflows/form_builder.html:274
+#: workflows/templates/workflows/form_builder.html:345
 msgid "Sichtbar"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:288
+#: workflows/templates/workflows/form_builder.html:282
 #, fuzzy
 #| msgid "Regeln speichern"
 msgid "Abschnittsregeln speichern"
 msgstr "Save rules"
 
-#: workflows/templates/workflows/form_builder.html:299
+#: workflows/templates/workflows/form_builder.html:293
 #, fuzzy
 #| msgid "Feldtexte verwalten"
 msgid "Feldregeln verwalten"
 msgstr "Manage field text"
 
-#: workflows/templates/workflows/form_builder.html:300
+#: workflows/templates/workflows/form_builder.html:294
 msgid "Steuern Sie Sichtbarkeit und Pflichtstatus für einzelne Felder."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:303
+#: workflows/templates/workflows/form_builder.html:297
 msgid "konfigurierbar"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:309
+#: workflows/templates/workflows/form_builder.html:303
 #, fuzzy
 #| msgid "Abschnitt"
 msgid "Feldregel-Abschnitte"
 msgstr "Section"
 
-#: workflows/templates/workflows/form_builder.html:344
+#: workflows/templates/workflows/form_builder.html:338
 msgid "Flexibel"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:357
+#: workflows/templates/workflows/form_builder.html:351
 #, fuzzy
 #| msgid "Standardsprache"
 msgid "Standard"
 msgstr "Default language"
 
-#: workflows/templates/workflows/form_builder.html:359
+#: workflows/templates/workflows/form_builder.html:353
 #: workflows/templates/workflows/user_management.html:109
 msgid "Optional"
 msgstr "Optional"
 
-#: workflows/templates/workflows/form_builder.html:365
+#: workflows/templates/workflows/form_builder.html:359
 #, fuzzy
 #| msgid "Keine Feldkonfigurationen verfügbar."
 msgid "Keine Feldregeln verfügbar."
 msgstr "No field configurations available."
 
-#: workflows/templates/workflows/form_builder.html:373
+#: workflows/templates/workflows/form_builder.html:367
 #, fuzzy
 #| msgid "Regeln speichern"
 msgid "Feldregeln speichern"
 msgstr "Save rules"
 
-#: workflows/templates/workflows/form_builder.html:385
+#: workflows/templates/workflows/form_builder.html:379
 msgid "Lassen Sie Felder abhängig von anderen Antworten ein- oder ausblenden."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:388
+#: workflows/templates/workflows/form_builder.html:382
 #, fuzzy
 #| msgid "Regelname"
 msgid "Regeln"
 msgstr "Rule name"
 
-#: workflows/templates/workflows/form_builder.html:394
+#: workflows/templates/workflows/form_builder.html:388
 #, fuzzy
 #| msgid "Branding speichern"
 msgid "Bedingte Regeln"
 msgstr "Save branding"
 
-#: workflows/templates/workflows/form_builder.html:399
+#: workflows/templates/workflows/form_builder.html:393
 #, fuzzy, python-format
 #| msgid "Keine konfigurierten Felder in diesem Schritt."
 msgid "%(count)s Ziel-Feld/Felder"
 msgstr "No configured fields in this step."
 
-#: workflows/templates/workflows/form_builder.html:411
+#: workflows/templates/workflows/form_builder.html:405
 #, fuzzy
 #| msgid "Sicherheitsregeln"
 msgid "Sichtbarkeit"
 msgstr "Safety rules"
 
-#: workflows/templates/workflows/form_builder.html:415
+#: workflows/templates/workflows/form_builder.html:409
 msgid "Steuert"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:420
+#: workflows/templates/workflows/form_builder.html:414
 #, fuzzy
 #| msgid "Keine geplanten Welcome E-Mails vorhanden."
 msgid "Keine Ziel-Felder."
 msgstr "No scheduled welcome emails available."
 
-#: workflows/templates/workflows/form_builder.html:432
+#: workflows/templates/workflows/form_builder.html:426
 #, fuzzy
 #| msgid "Sicherheitsregeln"
 msgid "Sichtbar, wenn"
 msgstr "Safety rules"
 
-#: workflows/templates/workflows/form_builder.html:437
+#: workflows/templates/workflows/form_builder.html:431
 #, fuzzy
 #| msgid "inaktiv"
 msgid "Inaktiv"
 msgstr "inactive"
 
-#: workflows/templates/workflows/form_builder.html:446
+#: workflows/templates/workflows/form_builder.html:440
 msgid "Zeige dieses Element, wenn"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:448
-#: workflows/templates/workflows/form_builder.html:465
+#: workflows/templates/workflows/form_builder.html:442
+#: workflows/templates/workflows/form_builder.html:459
 msgid "Keine"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:458
-#: workflows/templates/workflows/form_builder.html:475
+#: workflows/templates/workflows/form_builder.html:452
+#: workflows/templates/workflows/form_builder.html:469
 #: workflows/templates/workflows/intro_builder.html:64
 msgid "Wert"
 msgstr "Value"
 
-#: workflows/templates/workflows/form_builder.html:461
+#: workflows/templates/workflows/form_builder.html:455
 #, fuzzy
 #| msgid "Zusätzlicher Zugang besprochen: %(item)s"
 msgid "Zusätzliche Bedingung"
 msgstr "Additional access discussed: %(item)s"
 
-#: workflows/templates/workflows/form_builder.html:463
+#: workflows/templates/workflows/form_builder.html:457
 msgid "Und zusätzlich"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:485
+#: workflows/templates/workflows/form_builder.html:479
 #, fuzzy
 #| msgid "Branding speichern"
 msgid "Bedingte Logik speichern"
 msgstr "Save branding"
 
-#: workflows/templates/workflows/form_builder.html:500
+#: workflows/templates/workflows/form_builder.html:494
 msgid ""
 "Pflegen Sie Auswahlwerte, Feldtexte und benutzerdefinierte Erweiterungen."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:510
+#: workflows/templates/workflows/form_builder.html:504
 #, fuzzy
 #| msgid "Inhalt"
 msgid "Inhaltsmodule"
 msgstr "Contents"
 
-#: workflows/templates/workflows/form_builder.html:511 workflows/views.py:3000
+#: workflows/templates/workflows/form_builder.html:505 workflows/views.py:3000
 #, fuzzy
 #| msgid "Aktion"
 msgid "Optionen"
 msgstr "Action"
 
-#: workflows/templates/workflows/form_builder.html:512 workflows/views.py:3001
+#: workflows/templates/workflows/form_builder.html:506 workflows/views.py:3001
 #, fuzzy
 #| msgid "Feldtexte verwalten"
 msgid "Feldtexte"
 msgstr "Manage field text"
 
-#: workflows/templates/workflows/form_builder.html:514
-#: workflows/templates/workflows/form_builder.html:666 workflows/views.py:3002
+#: workflows/templates/workflows/form_builder.html:508
+#: workflows/templates/workflows/form_builder.html:660 workflows/views.py:3002
 #, fuzzy
 #| msgid "Abschnitt"
 msgid "Eigene Abschnitte"
 msgstr "Section"
 
-#: workflows/templates/workflows/form_builder.html:516
-#: workflows/templates/workflows/form_builder.html:754 workflows/views.py:3003
+#: workflows/templates/workflows/form_builder.html:510
+#: workflows/templates/workflows/form_builder.html:748 workflows/views.py:3003
 msgid "Eigene Felder"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:517 workflows/views.py:3004
+#: workflows/templates/workflows/form_builder.html:511 workflows/views.py:3004
 msgid "Vorschau"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:528
+#: workflows/templates/workflows/form_builder.html:522
 msgid "Kategorie"
 msgstr "Category"
 
-#: workflows/templates/workflows/form_builder.html:541
-#: workflows/templates/workflows/form_builder.html:571
-#: workflows/templates/workflows/form_builder.html:631
-#: workflows/templates/workflows/form_builder.html:772
-#: workflows/templates/workflows/form_builder.html:889
+#: workflows/templates/workflows/form_builder.html:535
+#: workflows/templates/workflows/form_builder.html:565
+#: workflows/templates/workflows/form_builder.html:625
+#: workflows/templates/workflows/form_builder.html:766
+#: workflows/templates/workflows/form_builder.html:883
 msgid "Label (DE)"
 msgstr "Label (DE)"
 
-#: workflows/templates/workflows/form_builder.html:542
+#: workflows/templates/workflows/form_builder.html:536
 msgid "Label (EN, optional)"
 msgstr "Label (EN, optional)"
 
-#: workflows/templates/workflows/form_builder.html:543
+#: workflows/templates/workflows/form_builder.html:537
 msgid "Technischer Wert (optional)"
 msgstr "Technical value (optional)"
 
-#: workflows/templates/workflows/form_builder.html:544
+#: workflows/templates/workflows/form_builder.html:538
 msgid "Option hinzufügen"
 msgstr "Add option"
 
-#: workflows/templates/workflows/form_builder.html:555
+#: workflows/templates/workflows/form_builder.html:549
 msgid "Ziehen zum Sortieren"
 msgstr "Drag to reorder"
 
-#: workflows/templates/workflows/form_builder.html:566
+#: workflows/templates/workflows/form_builder.html:560
 msgid "Option wirklich löschen?"
 msgstr "Delete this option?"
 
-#: workflows/templates/workflows/form_builder.html:575
-#: workflows/templates/workflows/form_builder.html:635
-#: workflows/templates/workflows/form_builder.html:776
-#: workflows/templates/workflows/form_builder.html:893
+#: workflows/templates/workflows/form_builder.html:569
+#: workflows/templates/workflows/form_builder.html:629
+#: workflows/templates/workflows/form_builder.html:770
+#: workflows/templates/workflows/form_builder.html:887
 msgid "Label (EN)"
 msgstr "Label (EN)"
 
-#: workflows/templates/workflows/form_builder.html:585
+#: workflows/templates/workflows/form_builder.html:579
 msgid "Keine Optionen in dieser Kategorie."
 msgstr "No options in this category."
 
-#: workflows/templates/workflows/form_builder.html:589
+#: workflows/templates/workflows/form_builder.html:583
 msgid "Optionen speichern"
 msgstr "Save options"
 
-#: workflows/templates/workflows/form_builder.html:600
+#: workflows/templates/workflows/form_builder.html:594
 msgid "Feldtexte verwalten"
 msgstr "Manage field text"
 
-#: workflows/templates/workflows/form_builder.html:601
+#: workflows/templates/workflows/form_builder.html:595
 msgid "Überschreiben Sie Labels und Hilfetexte pro Feld."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:607
+#: workflows/templates/workflows/form_builder.html:601
 #, fuzzy
 #| msgid "Abschnitt"
 msgid "Feldtext-Abschnitte"
 msgstr "Section"
 
-#: workflows/templates/workflows/form_builder.html:632
+#: workflows/templates/workflows/form_builder.html:626
 msgid "Fallback: Standardlabel"
 msgstr "Fallback: default label"
 
-#: workflows/templates/workflows/form_builder.html:636
+#: workflows/templates/workflows/form_builder.html:630
 msgid "English label"
 msgstr "English label"
 
-#: workflows/templates/workflows/form_builder.html:639
-#: workflows/templates/workflows/form_builder.html:804
-#: workflows/templates/workflows/form_builder.html:897
+#: workflows/templates/workflows/form_builder.html:633
+#: workflows/templates/workflows/form_builder.html:798
+#: workflows/templates/workflows/form_builder.html:891
 msgid "Hilfetext (DE)"
 msgstr "Help text (DE)"
 
-#: workflows/templates/workflows/form_builder.html:640
+#: workflows/templates/workflows/form_builder.html:634
 msgid "Optionaler Hilfetext"
 msgstr "Optional help text"
 
-#: workflows/templates/workflows/form_builder.html:643
-#: workflows/templates/workflows/form_builder.html:808
-#: workflows/templates/workflows/form_builder.html:901
+#: workflows/templates/workflows/form_builder.html:637
+#: workflows/templates/workflows/form_builder.html:802
+#: workflows/templates/workflows/form_builder.html:895
 msgid "Hilfetext (EN)"
 msgstr "Help text (EN)"
 
-#: workflows/templates/workflows/form_builder.html:644
+#: workflows/templates/workflows/form_builder.html:638
 msgid "Optional English help text"
 msgstr "Optional English help text"
 
-#: workflows/templates/workflows/form_builder.html:649
+#: workflows/templates/workflows/form_builder.html:643
 msgid "Keine Feldkonfigurationen verfügbar."
 msgstr "No field configurations available."
 
-#: workflows/templates/workflows/form_builder.html:655
+#: workflows/templates/workflows/form_builder.html:649
 msgid "Feldtexte speichern"
 msgstr "Save field text"
 
-#: workflows/templates/workflows/form_builder.html:667
+#: workflows/templates/workflows/form_builder.html:661
 msgid "Erweitern Sie den Workflow um eigene inhaltliche Blöcke."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:678
-#: workflows/templates/workflows/form_builder.html:697
+#: workflows/templates/workflows/form_builder.html:672
+#: workflows/templates/workflows/form_builder.html:691
 #, fuzzy
 #| msgid "Punkt hinzufügen"
 msgid "Abschnitt hinzufügen"
 msgstr "Add item"
 
-#: workflows/templates/workflows/form_builder.html:679
+#: workflows/templates/workflows/form_builder.html:673
 msgid ""
 "Erstellen Sie zusätzliche Bereiche für deployment-spezifische Informationen."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:684
-#: workflows/templates/workflows/form_builder.html:725
+#: workflows/templates/workflows/form_builder.html:678
+#: workflows/templates/workflows/form_builder.html:719
 #, fuzzy
 #| msgid "Label (DE)"
 msgid "Titel (DE)"
 msgstr "Label (DE)"
 
-#: workflows/templates/workflows/form_builder.html:688
-#: workflows/templates/workflows/form_builder.html:729
+#: workflows/templates/workflows/form_builder.html:682
+#: workflows/templates/workflows/form_builder.html:723
 #, fuzzy
 #| msgid "Label (EN)"
 msgid "Titel (EN)"
 msgstr "Label (EN)"
 
-#: workflows/templates/workflows/form_builder.html:712
+#: workflows/templates/workflows/form_builder.html:706
 #, fuzzy
 #| msgid "Keine konfigurierten Felder in diesem Schritt."
 msgid "Feld/Felder"
 msgstr "No configured fields in this step."
 
-#: workflows/templates/workflows/form_builder.html:720
+#: workflows/templates/workflows/form_builder.html:714
 #, python-format
 msgid ""
 "Eigenen Abschnitt wirklich löschen? %(count)s zugehörige eigene Felder "
 "werden ebenfalls entfernt."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:739
+#: workflows/templates/workflows/form_builder.html:733
 #, fuzzy
 #| msgid "Keine geplanten Welcome E-Mails vorhanden."
 msgid "Keine eigenen Abschnitte vorhanden."
 msgstr "No scheduled welcome emails available."
 
-#: workflows/templates/workflows/form_builder.html:743
+#: workflows/templates/workflows/form_builder.html:737
 #, fuzzy
 #| msgid "Regeln speichern"
 msgid "Abschnitte speichern"
 msgstr "Save rules"
 
-#: workflows/templates/workflows/form_builder.html:755
+#: workflows/templates/workflows/form_builder.html:749
 msgid ""
 "Erstellen Sie zusätzliche Eingaben innerhalb bestehender oder eigener "
 "Abschnitte."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:766
+#: workflows/templates/workflows/form_builder.html:760
 #, fuzzy
 #| msgid "Neue Regel hinzufügen"
 msgid "Feld hinzufügen"
 msgstr "Add new rule"
 
-#: workflows/templates/workflows/form_builder.html:767
+#: workflows/templates/workflows/form_builder.html:761
 msgid ""
 "Erstellen Sie zusätzliche Eingaben innerhalb eines bestehenden oder eigenen "
 "Abschnitts."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:780
-#: workflows/templates/workflows/form_builder.html:869
+#: workflows/templates/workflows/form_builder.html:774
+#: workflows/templates/workflows/form_builder.html:863
 #: workflows/templates/workflows/intro_builder.html:29
 #: workflows/templates/workflows/intro_builder.html:59
 msgid "Abschnitt"
 msgstr "Section"
 
-#: workflows/templates/workflows/form_builder.html:801
+#: workflows/templates/workflows/form_builder.html:795
 #, fuzzy
 #| msgid "Pflicht"
 msgid "Pflichtfeld"
 msgstr "Required"
 
-#: workflows/templates/workflows/form_builder.html:812
-#: workflows/templates/workflows/form_builder.html:905
+#: workflows/templates/workflows/form_builder.html:806
+#: workflows/templates/workflows/form_builder.html:899
 #, fuzzy
 #| msgid "Aktion"
 msgid "Optionen (DE)"
 msgstr "Action"
 
-#: workflows/templates/workflows/form_builder.html:813
+#: workflows/templates/workflows/form_builder.html:807
 msgid "Eine Option pro Zeile, optional: wert|Label"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:816
-#: workflows/templates/workflows/form_builder.html:909
+#: workflows/templates/workflows/form_builder.html:810
+#: workflows/templates/workflows/form_builder.html:903
 #, fuzzy
 #| msgid "Aktion"
 msgid "Optionen (EN)"
 msgstr "Action"
 
-#: workflows/templates/workflows/form_builder.html:817
+#: workflows/templates/workflows/form_builder.html:811
 msgid "Eine Option pro Zeile, optional: value|Label"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:821
+#: workflows/templates/workflows/form_builder.html:815
 #, fuzzy
 #| msgid "Neue Regel hinzufügen"
 msgid "Eigenes Feld hinzufügen"
 msgstr "Add new rule"
 
-#: workflows/templates/workflows/form_builder.html:828
+#: workflows/templates/workflows/form_builder.html:822
 #, fuzzy
 #| msgid "Feldtexte speichern"
 msgid "Eigene Feld-Abschnitte"
 msgstr "Save field text"
 
-#: workflows/templates/workflows/form_builder.html:865
+#: workflows/templates/workflows/form_builder.html:859
 #, fuzzy
 #| msgid "Option wirklich löschen?"
 msgid "Eigenes Feld wirklich löschen?"
 msgstr "Delete this option?"
 
-#: workflows/templates/workflows/form_builder.html:915
+#: workflows/templates/workflows/form_builder.html:909
 #, fuzzy
 #| msgid "Keine geplanten Welcome E-Mails vorhanden."
 msgid "Keine eigenen Felder vorhanden."
 msgstr "No scheduled welcome emails available."
 
-#: workflows/templates/workflows/form_builder.html:923
+#: workflows/templates/workflows/form_builder.html:917
 #, fuzzy
 #| msgid "Feldtexte speichern"
 msgid "Eigene Felder speichern"
 msgstr "Save field text"
 
-#: workflows/templates/workflows/form_builder.html:934 workflows/views.py:3029
+#: workflows/templates/workflows/form_builder.html:928 workflows/views.py:3029
 msgid "Live-Vorschau"
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:935
+#: workflows/templates/workflows/form_builder.html:929
 msgid "So wirkt die aktuelle Struktur für das aktive Formular."
 msgstr ""
 
-#: workflows/templates/workflows/form_builder.html:949
+#: workflows/templates/workflows/form_builder.html:943
 msgid "Keine sichtbaren Felder."
 msgstr ""
 
diff --git a/backend/workflows/static/workflows/css/form_builder.css b/backend/workflows/static/workflows/css/form_builder.css
index 32c9e1d..e52ceaa 100644
--- a/backend/workflows/static/workflows/css/form_builder.css
+++ b/backend/workflows/static/workflows/css/form_builder.css
@@ -45,7 +45,7 @@ body {
 }
 
 .builder-sidebar-card h2 {
-  margin: 6px 0 8px;
+  margin: 6px 0 0;
   font-size: 20px;
   color: #142033;
 }
@@ -222,10 +222,10 @@ body {
 .builder-toolbar {
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  gap: 14px;
-  margin: 10px 0 14px;
-  padding: 12px 14px;
+  justify-content: flex-start;
+  gap: 10px;
+  margin: 8px 0 14px;
+  padding: 10px 12px;
   border: 1px solid #d7e0ec;
   border-radius: 16px;
   background: linear-gradient(180deg, #fbfdff, #f7fbff);
@@ -261,14 +261,6 @@ body {
   color: #142033;
 }
 
-.builder-toolbar-note {
-  color: #5f7089;
-  font-size: 12px;
-  line-height: 1.5;
-  max-width: 360px;
-  text-align: right;
-}
-
 .builder-lang-switch {
   display: inline-flex;
   align-items: center;
@@ -301,6 +293,22 @@ body {
   color: #fff;
 }
 
+.builder-main .btn,
+.builder-main .tab,
+.builder-main .builder-module-link,
+.builder-main .builder-lang-btn {
+  min-height: 38px;
+}
+
+.builder-main .btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 14px;
+  border-radius: 12px;
+  font-weight: 800;
+}
+
 .tab {
   border: 1px solid #c6d1e1;
   border-radius: 999px;
@@ -1113,7 +1121,7 @@ body {
 .structure-card {
   display: grid;
   gap: 8px;
-  padding: 16px;
+  padding: 14px;
   border: 1px solid #d7e0ec;
   border-radius: 18px;
   background: linear-gradient(180deg, #f8fbff 0%, #ffffff 100%);
@@ -1507,13 +1515,17 @@ body {
   margin-top: 12px;
   display: flex;
   justify-content: flex-end;
+  gap: 10px;
+  flex-wrap: wrap;
 }
 
 .options-actions-sticky {
   position: sticky;
   bottom: 0;
   z-index: 2;
+  margin-top: 14px;
   padding-top: 12px;
+  border-top: 1px solid #e5ecf5;
   background: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.98) 32%);
 }
 
diff --git a/backend/workflows/templates/workflows/form_builder.html b/backend/workflows/templates/workflows/form_builder.html
index 5d072cc..781da4e 100644
--- a/backend/workflows/templates/workflows/form_builder.html
+++ b/backend/workflows/templates/workflows/form_builder.html
@@ -16,7 +16,6 @@
         <div class="builder-sidebar-card">
           <span class="builder-sidebar-eyebrow">{% trans "Arbeitsbereich" %}</span>
           <h2>{% trans "Formularsteuerung" %}</h2>
-          <p>{% trans "Arbeiten Sie blockweise: zuerst Struktur, dann Regeln, danach Inhalte und Erweiterungen." %}</p>
         </div>
 
         <nav class="builder-side-nav" aria-label="{% trans 'Builder Navigation' %}">
@@ -75,7 +74,6 @@
       <div class="builder-hero-copy">
         <span class="builder-eyebrow">{% trans "Deployment Configuration" %}</span>
         <h1>{% trans "Form Builder" %}</h1>
-        <p class="builder-hero-sub">{% trans "Steuern Sie Struktur, Regeln und Inhalte Ihrer Standard-Workflows an einem Ort." %}</p>
       </div>
       <div class="builder-hero-actions">
         <form method="post" action="{% url 'set_language' %}" class="builder-lang-switch">
@@ -113,9 +111,6 @@
         </span>
         {% endif %}
       </div>
-      <div class="builder-toolbar-note">
-        {% trans "Arbeiten Sie jeweils nur in einem Bereich und speichern Sie Änderungen abschnittsweise." %}
-      </div>
     </section>
 
     {% include 'workflows/includes/messages.html' %}
@@ -140,7 +135,6 @@
             <section class="structure-card">
               <span class="structure-card-eyebrow">{% trans "Arbeitsmodus" %}</span>
               <h3>{% trans "Direkte Anordnung" %}</h3>
-              <p>{% trans "Verschieben Sie Felder direkt zwischen Abschnitten. Die Reihenfolge wird erst mit dem globalen Speichern oben übernommen." %}</p>
             </section>
 
             <section class="structure-card structure-card-muted">