diff --git a/contao/templates/frontend/event_edit.html.twig b/contao/templates/frontend/event_edit.html.twig
index 4b4a9e2..e3e9cd6 100644
--- a/contao/templates/frontend/event_edit.html.twig
+++ b/contao/templates/frontend/event_edit.html.twig
@@ -36,6 +36,16 @@
       .module-event-edit .filepond--root .filepond--file-action-button {
         pointer-events: auto;
       }
+
+      .module-event-edit .filepond--root .filepond--image-preview-wrapper {
+        background: #f7f7f7;
+      }
+
+      .module-event-edit .filepond--root .filepond--image-preview-overlay-idle,
+      .module-event-edit .filepond--root .filepond--image-preview-overlay-success,
+      .module-event-edit .filepond--root .filepond--image-preview-overlay-failure {
+        background: rgba(255, 255, 255, 0.65);
+      }
     </style>
     <script src="https://cdn.jsdelivr.net/npm/choices.js/public/assets/scripts/choices.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
diff --git a/contao/templates/frontend/organization_edit.html.twig b/contao/templates/frontend/organization_edit.html.twig
index 28fab59..ba4d6bb 100644
--- a/contao/templates/frontend/organization_edit.html.twig
+++ b/contao/templates/frontend/organization_edit.html.twig
@@ -34,6 +34,16 @@
       .module-organization-edit .filepond--root .filepond--file-action-button {
         pointer-events: auto;
       }
+
+      .module-organization-edit .filepond--root .filepond--image-preview-wrapper {
+        background: #f7f7f7;
+      }
+
+      .module-organization-edit .filepond--root .filepond--image-preview-overlay-idle,
+      .module-organization-edit .filepond--root .filepond--image-preview-overlay-success,
+      .module-organization-edit .filepond--root .filepond--image-preview-overlay-failure {
+        background: rgba(255, 255, 255, 0.65);
+      }
     </style>
     <script src="https://cdn.jsdelivr.net/npm/choices.js/public/assets/scripts/choices.min.js"></script>
     <script src="https://unpkg.com/filepond/dist/filepond.min.js"></script>
diff --git a/src/Controller/Frontend/OrganizationEditController.php b/src/Controller/Frontend/OrganizationEditController.php
index 3df9c37..c241774 100644
--- a/src/Controller/Frontend/OrganizationEditController.php
+++ b/src/Controller/Frontend/OrganizationEditController.php
@@ -70,10 +70,9 @@ class OrganizationEditController extends AbstractFrontendModuleController
         $formData = [
             'title' => (string) ($organization['title'] ?? ''),
             'street' => (string) ($organization['street'] ?? ''),
+            'street2' => (string) ($organization['street2'] ?? ''),
             'postal' => (string) ($organization['postal'] ?? ''),
             'city' => (string) ($organization['city'] ?? ''),
-            'state' => (string) ($organization['state'] ?? ''),
-            'country' => (string) ($organization['country'] ?? ''),
             'phone' => (string) ($organization['phone'] ?? ''),
             'email' => (string) ($organization['email'] ?? ''),
             'website' => (string) ($organization['website'] ?? ''),
diff --git a/src/Form/OrganizationType.php b/src/Form/OrganizationType.php
index 3dbd57c..0abc180 100644
--- a/src/Form/OrganizationType.php
+++ b/src/Form/OrganizationType.php
@@ -20,10 +20,9 @@ class OrganizationType extends AbstractType
         $builder
             ->add('title', TextType::class, ['label' => 'Titel', 'required' => true])
             ->add('street', TextType::class, ['label' => 'Straße', 'required' => false])
+            ->add('street2', TextType::class, ['label' => 'Weitere Adressangaben', 'required' => false])
             ->add('postal', TextType::class, ['label' => 'PLZ', 'required' => false])
             ->add('city', TextType::class, ['label' => 'Ort', 'required' => false])
-            ->add('state', TextType::class, ['label' => 'Bundesland', 'required' => false])
-            ->add('country', TextType::class, ['label' => 'Land', 'required' => false])
             ->add('phone', TextType::class, ['label' => 'Telefon', 'required' => false])
             ->add('email', EmailType::class, ['label' => 'E-Mail', 'required' => false])
             ->add('website', TextType::class, ['label' => 'Webseite', 'required' => false])
diff --git a/src/Service/OrganizationRepository.php b/src/Service/OrganizationRepository.php
index c028035..b6511ab 100644
--- a/src/Service/OrganizationRepository.php
+++ b/src/Service/OrganizationRepository.php
@@ -71,10 +71,9 @@ class OrganizationRepository
             [
                 'title' => $data['title'] ?? '',
                 'street' => $data['street'] ?? '',
+                'street2' => $data['street2'] ?? '',
                 'postal' => $data['postal'] ?? '',
                 'city' => $data['city'] ?? '',
-                'state' => $data['state'] ?? '',
-                'country' => $data['country'] ?? '',
                 'phone' => $data['phone'] ?? '',
                 'email' => $data['email'] ?? '',
                 'website' => $data['website'] ?? '',